From f4730179a4436dff7282bc42bc6aa58fb5fb63b5 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 28 Sep 2011 17:14:31 +0200 Subject: Fix ES2 shaders Add missing floating point precision qualifiers. '#extension OES_standard_derivatives : require' somehow doesn't pass the GLSL compiler, however '#extension GL_OES_standard_derivatives : enable' does. Currently works on ARM's Mali-400 MP, NV Tegra still don't show a picture. TODO: More in depth evaluation. --- .../classes/jogamp/graph/curve/opengl/shader/curverenderer01-es2.fp | 3 ++- .../classes/jogamp/graph/curve/opengl/shader/curverenderer01-xxx.fp | 2 +- .../classes/jogamp/graph/curve/opengl/shader/curverenderer02-es2.fp | 3 ++- .../classes/jogamp/graph/curve/opengl/shader/curverenderer02-xxx.fp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/jogl/classes/jogamp/graph') diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-es2.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-es2.fp index 953349f5a..94e62c042 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-es2.fp +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-es2.fp @@ -3,7 +3,8 @@ #version 100 // we require dFdx/dFdy -#extension OES_standard_derivatives : require +// #extension OES_standard_derivatives : require +#extension GL_OES_standard_derivatives : enable #include curverenderer01-xxx.fp diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-xxx.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-xxx.fp index 300164466..52cff807c 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-xxx.fp +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-xxx.fp @@ -27,7 +27,7 @@ void main (void) // size = 1.0/textureSize(gcu_TextureUnit,0); //#endif rtex -= 5.0; - vec4 t = texture2D(gcu_TextureUnit, rtex)* 0.18; + GRAPHP vec4 t = texture2D(gcu_TextureUnit, rtex)* 0.18; t += texture2D(gcu_TextureUnit, rtex + size*(vec2(1, 0)))*tex_weights.x; t += texture2D(gcu_TextureUnit, rtex - size*(vec2(1, 0)))*tex_weights.x; diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-es2.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-es2.fp index 66361389b..80702d721 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-es2.fp +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-es2.fp @@ -3,7 +3,8 @@ #version 100 // we require dFdx/dFdy -#extension OES_standard_derivatives : require +// #extension OES_standard_derivatives : require +#extension GL_OES_standard_derivatives : enable #include curverenderer02-xxx.fp diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-xxx.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-xxx.fp index ee061a95f..3ba4c8d40 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-xxx.fp +++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer02-xxx.fp @@ -27,7 +27,7 @@ void main (void) // size = 1.0/textureSize(gcu_TextureUnit,0); //#endif rtex -= 5.0; - vec4 t = texture2D(gcu_TextureUnit, rtex)* 0.18; + GRAPHP vec4 t = texture2D(gcu_TextureUnit, rtex)* 0.18; t += texture2D(gcu_TextureUnit, rtex + size*(vec2(1, 0)))*tex_weights.x; t += texture2D(gcu_TextureUnit, rtex - size*(vec2(1, 0)))*tex_weights.x; -- cgit v1.2.3