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 /make/config/jogl/gl-if-gl-ignores.cfg | |
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 'make/config/jogl/gl-if-gl-ignores.cfg')
-rw-r--r-- | make/config/jogl/gl-if-gl-ignores.cfg | 44 |
1 files changed, 8 insertions, 36 deletions
diff --git a/make/config/jogl/gl-if-gl-ignores.cfg b/make/config/jogl/gl-if-gl-ignores.cfg index 220bd74bf..25fbd5a6f 100644 --- a/make/config/jogl/gl-if-gl-ignores.cfg +++ b/make/config/jogl/gl-if-gl-ignores.cfg @@ -32,13 +32,19 @@ IgnoreExtension GL_EXT_debug_marker IgnoreExtension GL_EXT_debug_label IgnoreExtension GL_EXT_multisampled_render_to_texture IgnoreExtension GL_EXT_framebuffer_multisample - +IgnoreExtension GL_OES_texture_half_float +IgnoreExtension GL_OES_vertex_half_float # IgnoreExtension GL_EXT_texture_storage IgnoreExtension GL_NV_draw_buffers IgnoreExtension GL_NV_fbo_color_attachments IgnoreExtension GL_OES_vertex_array_object IgnoreExtension GL_OES_texture_3D -# above ext are subsumed, so ignore the aliased ones + +# includes GL_STATE_RESTORE, which hasn't the QCOM suffix +IgnoreExtension GL_QCOM_extended_get +Ignore GL_STATE_RESTORE + +# above ext mightbe subsumed, ignore the aliased ones Ignore GL_ACTIVE_PROGRAM Ignore GL_ALPHA16F Ignore GL_ALPHA32F @@ -156,10 +162,6 @@ Ignore glPushGroupMarkerEXT # isn't included in GL2 Ignore GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET -# includes GL_STATE_RESTORE, which hasn't the QCOM suffix -IgnoreExtension GL_QCOM_extended_get -Ignore GL_STATE_RESTORE - Ignore GL_ACTIVE_ATTRIBUTE_MAX_LENGTH Ignore GL_ACTIVE_ATTRIBUTES Ignore GL_ACTIVE_UNIFORM_MAX_LENGTH @@ -348,36 +350,6 @@ Ignore GL_NORMAL_ARRAY_TYPE Ignore GL_NORMALIZE Ignore GL_NORMAL_MAP_OES Ignore GL_NUM_SHADER_BINARY_FORMATS -Ignore GL_OES_blend_equation_separate -Ignore GL_OES_blend_func_separate -Ignore GL_OES_blend_subtract -Ignore GL_OES_byte_coordinates -Ignore GL_OES_compressed_ETC1_RGB8_texture -Ignore GL_OES_compressed_paletted_texture -Ignore GL_OES_depth24 -Ignore GL_OES_depth32 -Ignore GL_OES_draw_texture -Ignore GL_OES_element_index_uint -Ignore GL_OES_extended_matrix_palette -Ignore GL_OES_fbo_render_mipmap -Ignore GL_OES_fixed_point -Ignore GL_OES_framebuffer_object -Ignore GL_OES_matrix_get -Ignore GL_OES_matrix_palette -Ignore GL_OES_point_size_array -Ignore GL_OES_point_sprite -Ignore GL_OES_query_matrix -Ignore GL_OES_read_format -Ignore GL_OES_single_precision -Ignore GL_OES_stencil1 -Ignore GL_OES_stencil4 -Ignore GL_OES_stencil8 -Ignore GL_OES_stencil_wrap -Ignore GL_OES_texture_cube_map -Ignore GL_OES_texture_env_crossbar -Ignore GL_OES_texture_half_float -Ignore GL_OES_texture_mirrored_repeat -Ignore GL_OES_vertex_half_float Ignore GL_ONE_MINUS_CONSTANT_ALPHA Ignore GL_ONE_MINUS_CONSTANT_COLOR Ignore GL_OPERAND0_ALPHA |