diff options
| author | Sven Gothel <[email protected]> | 2012-10-23 19:28:21 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-10-23 19:28:21 +0200 |
| commit | e027d4a2f9b3d7f23e9a9eec81c0cb011e861269 (patch) | |
| tree | 679d62942593204d2d0dc4594c7cfda8fc6f7db9 /src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc | |
| parent | 133d7b82d47b2918af042944158e9b09e2663855 (diff) | |
FixedFuncPipeline: Require GLSL 1.20 (GL 2.1) due to GL driver bugs in OSX (gl_PointCoords n/a otherwise); Add FFP Emul point test in TestPointNEWT/PointDemoES1.
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java index 8e0091e4c..716787b02 100644 --- a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java +++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java @@ -940,9 +940,7 @@ public class FixedFuncPipeline { // Shall we use: #ifdef GL_FRAGMENT_PRECISION_HIGH .. #endif for using highp in fragment shader if avail ? static final String es2_prelude_vp = "#version 100\n\nprecision highp float;\nprecision highp int;\n"; static final String es2_prelude_fp = "#version 100\n\nprecision mediump float;\nprecision mediump int;\n/*precision lowp sampler2D;*/\n"; - // static final String gl2_prelude = "#version 110\n"; // GL 2.0 - // static final String gl2_prelude = "#version 120\n"; // GL 2.1 (Nvidia driver claims it's required to use gl_Points -> driver bug) - static final String gl2_prelude = "// version 110\n"; + static final String gl2_prelude = "#version 120\n"; // GL 2.1 (Nvidia driver claims it's required to use gl_Points, OSX claim's it for gl_PointCoord -> driver bug - both were introduced w/ 1.10) private static final String constMaxTextures0 = "#define MAX_TEXTURE_UNITS 0\n"; private static final String constMaxTextures2 = "#define MAX_TEXTURE_UNITS 2\n"; |