diff options
author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-10-14 15:22:57 (GMT) |
---|---|---|
committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2009-10-14 15:42:52 (GMT) |
commit | 33d2bd641fd031d1a4e38198bf50538344a4ccdb (patch) | |
tree | 1ebdd7a17b849e901863b2adcad7c10657d62147 /src/opengl/util/ellipse_aa_radial.glsl | |
parent | 111558d709d7d55318bdf3de99442f26e246fcdc (diff) | |
download | Qt-33d2bd641fd031d1a4e38198bf50538344a4ccdb.zip Qt-33d2bd641fd031d1a4e38198bf50538344a4ccdb.tar.gz Qt-33d2bd641fd031d1a4e38198bf50538344a4ccdb.tar.bz2 |
Cleaned up OpenGL1 paint engine GLSL code.
Fixed warnings about int->float and float->vecN conversions. Removed
unused shader files.
Reviewed-by: Trond
Diffstat (limited to 'src/opengl/util/ellipse_aa_radial.glsl')
-rw-r--r-- | src/opengl/util/ellipse_aa_radial.glsl | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/opengl/util/ellipse_aa_radial.glsl b/src/opengl/util/ellipse_aa_radial.glsl deleted file mode 100644 index 0878f99..0000000 --- a/src/opengl/util/ellipse_aa_radial.glsl +++ /dev/null @@ -1,24 +0,0 @@ -#include "ellipse_functions.glsl" - -uniform sampler1D palette; -uniform vec2 fmp; -uniform float fmp2_m_radius2; -uniform vec4 inv_matrix; -uniform vec2 inv_matrix_offset; - -void main() -{ - // float2 A = frag_coord.xy;//mul(inv_matrix, frag_coord.xy) + inv_matrix_offset; - mat2 mat; - mat[0][0] = inv_matrix.x; - mat[0][1] = inv_matrix.y; - mat[1][0] = inv_matrix.z; - mat[1][1] = inv_matrix.w; - vec2 A = gl_FragCoord.xy * mat + inv_matrix_offset; - vec2 B = fmp; - float a = fmp2_m_radius2; - float b = 2.0*dot(A, B); - float c = -dot(A, A); - float val = (-b + sqrt(b*b - 4.0*a*c)) / (2.0*a); - gl_FragColor = texture1D(palette, val) * ellipse_aa(); -} |