diff options
| author | Sven Gothel <[email protected]> | 2012-10-31 14:40:44 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-10-31 14:40:44 +0100 |
| commit | c2b328ea96b6cb16ca39f13d4bb4d1236c4b8a1d (patch) | |
| tree | e9bf3a9a785242bb924799f56d624eda1fc044e1 /src/jogl/classes/jogamp/opengl | |
| parent | d4801323044a20455a256c7856c58b36b054a344 (diff) | |
Shader: Add '#define texture2D texture' for GLSL >= 130 ; TestGearsES2AWT add forceGL3; TextureDraw01ES2Listener uses defaultShaderCustomization()
Diffstat (limited to 'src/jogl/classes/jogamp/opengl')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorTexture.fp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorTexture.fp b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorTexture.fp index 82dfa24e1..130711e19 100644 --- a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorTexture.fp +++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/shaders/FixedFuncColorTexture.fp @@ -2,6 +2,7 @@ #if __VERSION__ >= 130 #define varying in out vec4 mgl_FragColor; + #define texture2D texture #else #define mgl_FragColor gl_FragColor #endif |