diff options
| author | Sven Gothel <[email protected]> | 2012-06-16 21:27:21 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-06-16 21:27:21 +0200 |
| commit | ccdc2ce6805e330cc5555b138044829f4bc67df9 (patch) | |
| tree | 03ab4d8960b4cd0992fa48de7fe1e5202d0a675d /src/jogl | |
| parent | 29e70f215069643c740e1b251490aa9edd61d2cb (diff) | |
Fix Bug 590: Wrong GL2 and GLES2 aliasing of GL_ARB_half_float_pixel/GL_ARB_half_float_vertex and GL_OES_texture_half_float extensions
We mistakenly aliase the GL2 and GLES2 extensions:
- GL_ARB_half_float_pixel
- GL_HALF_FLOAT_ARB 0x140B
- GL_ARB_half_float_vertex
- GL_HALF_FLOAT 0x140B
- GL_OES_texture_half_float extensions
- GL_HALF_FLOAT_OES 0x8D61
This also leads to adding GL_HALF_FLOAT_OES
to com.jogamp.opengl.util.GLBuffers.sizeof(..).
Diffstat (limited to 'src/jogl')
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java index 32391c650..8401b9cd2 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java +++ b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java @@ -43,6 +43,7 @@ import javax.media.opengl.GL; import javax.media.opengl.GL2; import javax.media.opengl.GL2ES2; import javax.media.opengl.GL2GL3; +import javax.media.opengl.GLES2; import javax.media.opengl.GLException; import java.nio.*; @@ -456,6 +457,7 @@ public class GLBuffers extends Buffers { case GL.GL_SHORT: case GL.GL_UNSIGNED_SHORT: case GL.GL_HALF_FLOAT: + case GLES2.GL_HALF_FLOAT_OES: esize = 2; break; case GL2ES2.GL_INT: |