From 8a8b9aca5e0510757157232fdbc8887569661666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 1 Aug 2013 17:58:07 +0200 Subject: [PATCH] Reducing pointer chasings, part 3f: less pointer passing in TextureTools. --- src/TextureTools/DistanceField.cpp | 10 +++++----- src/TextureTools/DistanceField.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/TextureTools/DistanceField.cpp b/src/TextureTools/DistanceField.cpp index 5c3adbe90..e2d185a8d 100644 --- a/src/TextureTools/DistanceField.cpp +++ b/src/TextureTools/DistanceField.cpp @@ -129,9 +129,9 @@ DistanceFieldShader::DistanceFieldShader(): radiusUniform(0), scalingUniform(1) } #ifndef MAGNUM_TARGET_GLES -void distanceField(Texture2D* input, Texture2D* output, const Rectanglei& rectangle, const Int radius, const Vector2i&) +void distanceField(Texture2D& input, Texture2D& output, const Rectanglei& rectangle, const Int radius, const Vector2i&) #else -void distanceField(Texture2D* input, Texture2D* output, const Rectanglei& rectangle, const Int radius, const Vector2i& imageSize) +void distanceField(Texture2D& input, Texture2D& output, const Rectanglei& rectangle, const Int radius, const Vector2i& imageSize) #endif { #ifndef MAGNUM_TARGET_GLES @@ -141,7 +141,7 @@ void distanceField(Texture2D* input, Texture2D* output, const Rectanglei& rectan /** @todo Disable depth test, blending and then enable it back (if was previously) */ #ifndef MAGNUM_TARGET_GLES - Vector2i imageSize = input->imageSize(0); + Vector2i imageSize = input.imageSize(0); #endif Framebuffer framebuffer(rectangle); @@ -161,7 +161,7 @@ void distanceField(Texture2D* input, Texture2D* output, const Rectanglei& rectan .setScaling(Vector2(imageSize)/rectangle.size()) .use(); - input->bind(DistanceFieldShader::TextureLayer); + input.bind(DistanceFieldShader::TextureLayer); #ifndef MAGNUM_TARGET_GLES if(!Context::current()->isVersionSupported(Version::GL300)) @@ -190,7 +190,7 @@ void distanceField(Texture2D* input, Texture2D* output, const Rectanglei& rectan Vector2( 3.0, 1.0) }; buffer.setData(triangle, Buffer::Usage::StaticDraw); - mesh.addVertexBuffer(&buffer, 0, DistanceFieldShader::Position()); + mesh.addVertexBuffer(buffer, 0, DistanceFieldShader::Position()); } /* Draw the mesh */ diff --git a/src/TextureTools/DistanceField.h b/src/TextureTools/DistanceField.h index e44e6ba8d..811ff6ba3 100644 --- a/src/TextureTools/DistanceField.h +++ b/src/TextureTools/DistanceField.h @@ -85,9 +85,9 @@ http://www.valvesoftware.com/publications/2007/SIGGRAPH2007_AlphaTestedMagnifica (jaggies, visible e.g. when rendering outlined fonts) */ #ifndef MAGNUM_TARGET_GLES -void MAGNUM_TEXTURETOOLS_EXPORT distanceField(Texture2D* input, Texture2D* output, const Rectanglei& rectangle, Int radius, const Vector2i& imageSize = Vector2i()); +void MAGNUM_TEXTURETOOLS_EXPORT distanceField(Texture2D& input, Texture2D& output, const Rectanglei& rectangle, Int radius, const Vector2i& imageSize = Vector2i()); #else -void MAGNUM_TEXTURETOOLS_EXPORT distanceField(Texture2D* input, Texture2D* output, const Rectanglei& rectangle, Int radius, const Vector2i& imageSize); +void MAGNUM_TEXTURETOOLS_EXPORT distanceField(Texture2D& input, Texture2D& output, const Rectanglei& rectangle, Int radius, const Vector2i& imageSize); #endif }}