diff options
| author | Sven Gothel <[email protected]> | 2013-07-17 01:14:00 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-07-17 01:14:00 +0200 |
| commit | bf84f193f9abcd9007939e966c30a958f9659cbf (patch) | |
| tree | 62a8f7d1e6813b55bb923516c33ef9f9e80a91f8 /src/jogl/classes/jogamp/graph/curve/opengl/shader | |
| parent | 74556de87d90539608cc69f072476e54b1a74f77 (diff) | |
More shader fixes for core (GLSL 150): texture2D -> texture, texture3D is deprecated in 130 and removed in 150.
Diffstat (limited to 'src/jogl/classes/jogamp/graph/curve/opengl/shader')
| -rw-r--r-- | src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass-weight.fp | 1 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/graph/curve/opengl/shader/curverenderer01-2pass.fp | 1 |
2 files changed, 2 insertions, 0 deletions
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 |