From 42a67d48d8772b91f59c4141b278a46d402d4276 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Wed, 14 Oct 2009 10:36:36 +0200 Subject: Fixed upside down brush patterns in the OpenGL paint engines. Task-number: QTBUG-2222 Reviewed-by: Gunnar --- src/opengl/gl2paintengineex/qglengineshadersource_p.h | 1 - src/opengl/util/pattern_brush.glsl | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h index 6712bf6..3eef808 100644 --- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h @@ -131,7 +131,6 @@ static const char* const qglslPositionWithPatternBrushVertexShader = "\ gl_Position.xy = gl_Position.xy * invertedHTexCoordsZ; \ gl_Position.w = invertedHTexCoordsZ; \ patternTexCoords.xy = (hTexCoords.xy * 0.125) * invertedHTexCoordsZ; \ - patternTexCoords.y = -patternTexCoords.y; \ }"; static const char* const qglslAffinePositionWithPatternBrushVertexShader diff --git a/src/opengl/util/pattern_brush.glsl b/src/opengl/util/pattern_brush.glsl index e070449..ac139b2 100644 --- a/src/opengl/util/pattern_brush.glsl +++ b/src/opengl/util/pattern_brush.glsl @@ -17,8 +17,6 @@ vec4 brush() coords *= inv_brush_texture_size; - coords.y = -coords.y; - float alpha = texture2D(brush_texture, coords).r; return gl_Color * alpha; -- cgit v0.12