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/test | |
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/test')
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/shader/fbo-mrt-2.fp | 3 |
1 files changed, 2 insertions, 1 deletions
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 +} |