More shader fixes for core (GLSL 150): texture2D -> texture, texture3D is deprecated in 130 and removed in 150.

4 files changed, 6 insertions, 3 deletions

diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 5489b7944..0ad9d8a83 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -618,13 +618,13 @@ function testawtswt() {
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
 
-#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestFBOMRTNEWT01 $*
+testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestFBOMRTNEWT01 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.TestRegionRendererNEWT01 $*
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestAddRemove01GLCanvasSwingAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES1NEWT $*
-testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES2NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleES2NEWT $*
 
 $spath/count-edt-start.sh java-run.log
 
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass-weight.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass-weight.fp
index 06edbeaee..fb71abd14 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass-weight.fp
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass-weight.fp
@@ -7,6 +7,7 @@
 #if __VERSION__ >= 130

   #define varying in

   out vec4 mgl_FragColor;

+  #define texture2D texture

 #else

   #define mgl_FragColor gl_FragColor

 #endif

diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass.fp b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass.fp
index 07a005709..8e5600dd9 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass.fp
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass.fp
@@ -7,6 +7,7 @@
 #if __VERSION__ >= 130
   #define varying in
   out vec4 mgl_FragColor;
+  #define texture2D texture
 #else
   #define mgl_FragColor gl_FragColor
 #endif
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/fbo-mrt-2.fp b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/fbo-mrt-2.fp
index 0087ca361..510096d66 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/fbo-mrt-2.fp
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/fbo-mrt-2.fp
@@ -3,6 +3,7 @@
 #if __VERSION__ >= 130
   #define varying in
   out vec4 mgl_FragData[2];
+  #define texture2D texture
 #else
   #define mgl_FragData gl_FragData   
 #endif
@@ -18,4 +19,4 @@ void main (void)
   vec2 rg = texture2D(gcs_TexUnit0, texCoord).rg + texture2D(gcs_TexUnit1, texCoord).rg;
   float b = frontColor.b - length(rg);
   mgl_FragData[0] = vec4( rg, b, 1.0 );
-}
\ No newline at end of file
+}