diff options
author | Sven Gothel <[email protected]> | 2011-10-02 08:15:02 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-10-02 08:15:02 +0200 |
commit | e8bd5dd90069f5815d2352c9c567c4ab3aa405d3 (patch) | |
tree | 3be2245186016ab4ae88f3f4d5518b14abdeaf66 | |
parent | 0fff6032340aec5510aba121a0a7415dbf223222 (diff) |
tegra test re-enable discardtegra-graph-shader_dosplit_dodiscard-freeze
-rw-r--r-- | src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-xxx.fp | 7 | ||||
-rw-r--r-- | src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-xxx.fp | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-xxx.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-xxx.fp index fba2edb64..a56b4d116 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-xxx.fp +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01a-xxx.fp @@ -23,13 +23,11 @@ void main (void) rtex.y -= 0.1; if(rtex.y < 0.0) { - /** discard freezes NV tegra2 compiler (TODO: dbl check) if(gcv_TexCoord.y < 0.0) { discard; } else { rtex.y = 0.0; - }*/ - rtex.y = 0.0; + } } vec2 f = vec2((dtx.y - dtx.x + 2.0*rtex.x*dtx.x), (dty.y - dty.x + 2.0*rtex.x*dty.x)); @@ -41,8 +39,7 @@ void main (void) if (a >= 1.0) { alpha = gcu_Alpha; } else if (a <= 0.0) { - // discard; // freezes NV tegra2 compiler (TODO: dbl check) - alpha = 0.0; + discard; } else { alpha = gcu_Alpha * a; // ?? mix(b_color,gcu_ColorStatic.rgb, a); diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-xxx.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-xxx.fp index 4bef33dbe..ee911066b 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-xxx.fp +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01b-xxx.fp @@ -42,10 +42,9 @@ void main (void) t += texture2D(gcu_TextureUnit, rtex + 4.0*size*(vec2(0, 1)))*tex_weights.w; t += texture2D(gcu_TextureUnit, rtex - 4.0*size*(vec2(0, 1)))*tex_weights.w; - /** discard freezes NV tegra2 compiler (TODO: dbl check) if(t.w == 0.0){ discard; - } */ + } c = t.xyz; alpha = gcu_Alpha * t.w; |