From bf84f193f9abcd9007939e966c30a958f9659cbf Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 17 Jul 2013 01:14:00 +0200 Subject: More shader fixes for core (GLSL 150): texture2D -> texture, texture3D is deprecated in 130 and removed in 150. --- .../jogamp/graph/curve/opengl/shader/curverenderer01-2pass-weight.fp | 1 + .../classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass.fp | 1 + 2 files changed, 2 insertions(+) (limited to 'src/jogl/classes/jogamp/graph') 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 -- cgit v1.2.3