diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-08-16 05:41:29 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-09-02 01:08:47 +0200 |
commit | 1de0dd02c8102f20ae9acea8af141eccaa20d5b6 (patch) | |
tree | 5dd33b69baec00a2389e2bd217ea8e801d8561fe /canvas/opengl/linearMultiColorGradientFragmentShader.glsl | |
parent | b29154d85e1c57c9001d3591a592b93032949212 (diff) |
make the shaders compliant to GLSL 1.2
Change-Id: Ic15760ca40d719ae333003c9bc241c813cb284fa
Diffstat (limited to 'canvas/opengl/linearMultiColorGradientFragmentShader.glsl')
-rw-r--r-- | canvas/opengl/linearMultiColorGradientFragmentShader.glsl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/canvas/opengl/linearMultiColorGradientFragmentShader.glsl b/canvas/opengl/linearMultiColorGradientFragmentShader.glsl index a3f3358c592b..7ad881368ac5 100644 --- a/canvas/opengl/linearMultiColorGradientFragmentShader.glsl +++ b/canvas/opengl/linearMultiColorGradientFragmentShader.glsl @@ -15,6 +15,13 @@ uniform sampler1D t_stopArray1d; uniform mat3x2 m_transform; varying vec2 v_textureCoords2d; +int max(int x, int y) +{ + if(x > y) + return x; + return y; +} + int findBucket(float t) { int nMinBucket=0; @@ -26,13 +33,13 @@ int findBucket(float t) void main(void) { - const float fAlpha = + float fAlpha = clamp( (m_transform * vec3(v_textureCoords2d,1)).s, 0.0, 1.0 ); - const int nMinBucket=findBucket( fAlpha ); + int nMinBucket = findBucket( fAlpha ); - const float fLerp = + float fLerp = (fAlpha-texture1D(t_stopArray1d, nMinBucket).s) / (texture1D(t_stopArray1d, nMinBucket+1).s - texture1D(t_stopArray1d, nMinBucket).s); |