diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-10-14 08:36:36 (GMT) |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-10-14 08:39:31 (GMT) |
| commit | 42a67d48d8772b91f59c4141b278a46d402d4276 (patch) | |
| tree | a4c18496f84a3f05fbeadd36a3dd469dbff6b9c1 /src/opengl | |
| parent | 8e709c4a3b8c1b843a662111e23076f8a02b2735 (diff) | |
| download | Qt-42a67d48d8772b91f59c4141b278a46d402d4276.zip Qt-42a67d48d8772b91f59c4141b278a46d402d4276.tar.gz Qt-42a67d48d8772b91f59c4141b278a46d402d4276.tar.bz2 | |
Fixed upside down brush patterns in the OpenGL paint engines.
Task-number: QTBUG-2222
Reviewed-by: Gunnar
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadersource_p.h | 1 | ||||
| -rw-r--r-- | src/opengl/util/pattern_brush.glsl | 2 |
2 files changed, 0 insertions, 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; |