diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/opengl/util/texture_brush.glsl | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/opengl/util/texture_brush.glsl')
-rw-r--r-- | src/opengl/util/texture_brush.glsl | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/opengl/util/texture_brush.glsl b/src/opengl/util/texture_brush.glsl deleted file mode 100644 index 949825583f..0000000000 --- a/src/opengl/util/texture_brush.glsl +++ /dev/null @@ -1,21 +0,0 @@ -uniform sampler2D brush_texture; -uniform vec2 inv_brush_texture_size; -uniform vec3 inv_matrix_m0; -uniform vec3 inv_matrix_m1; -uniform vec3 inv_matrix_m2; - -vec4 brush() -{ - mat3 mat; - - mat[0] = inv_matrix_m0; - mat[1] = inv_matrix_m1; - mat[2] = inv_matrix_m2; - - vec3 hcoords = mat * vec3(gl_FragCoord.xy, 1); - vec2 coords = hcoords.xy / hcoords.z; - - coords *= inv_brush_texture_size; - - return texture2D(brush_texture, coords); -} |