BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix incompatibility with <GL/glext.h>

Browse source 
New extensions in glext.h follow the pattern:

    #ifndef GL_ARB_texture_rectangle
    #define GL_ARB_texture_rectangle 1
    #define GL_TEXTURE_RECTANGLE_ARB          0x84F5
    #define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
    #define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
    #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
    #endif /* GL_ARB_texture_rectangle */

Versions.h tries to declare:

    const char* const GL_ARB_texture_rectangle = "GL_ARB_texture_rectangle";

Which means, if you've included glext.h before Versions.h, that the
compiler will see "const char* const 1 = ...", and rightly refuse to
continue.

The ham-fisted approach taken here is to rename the variables in
Versions.h with a leading underscore.  This does sort of undermine the
comment about "better to have the compiler do spelling checks", but.

Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2015-06-30 10:11:38 -04:00
parent 1189a7bc4a
commit 93deac5295
6 changed files with 221 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

94
glslang/MachineIndependent/Versions.cpp
View file

@ -149,58 +149,58 @@ namespace glslang {
//
void TParseContext::initializeExtensionBehavior()
{
extensionBehavior[GL_OES_texture_3D] = EBhDisable;
extensionBehavior[GL_OES_standard_derivatives] = EBhDisable;
extensionBehavior[GL_EXT_frag_depth] = EBhDisable;
extensionBehavior[GL_OES_EGL_image_external] = EBhDisable;
extensionBehavior[GL_EXT_shader_texture_lod] = EBhDisable;
extensionBehavior[_GL_OES_texture_3D] = EBhDisable;
extensionBehavior[_GL_OES_standard_derivatives] = EBhDisable;
extensionBehavior[_GL_EXT_frag_depth] = EBhDisable;
extensionBehavior[_GL_OES_EGL_image_external] = EBhDisable;
extensionBehavior[_GL_EXT_shader_texture_lod] = EBhDisable;
extensionBehavior[GL_ARB_texture_rectangle] = EBhDisable;
extensionBehavior[GL_3DL_array_objects] = EBhDisable;
extensionBehavior[GL_ARB_shading_language_420pack] = EBhDisable;
extensionBehavior[GL_ARB_texture_gather] = EBhDisable;
extensionBehavior[GL_ARB_gpu_shader5] = EBhDisablePartial;
extensionBehavior[GL_ARB_separate_shader_objects] = EBhDisable;
extensionBehavior[GL_ARB_compute_shader] = EBhDisablePartial;
extensionBehavior[GL_ARB_tessellation_shader] = EBhDisable;
extensionBehavior[GL_ARB_enhanced_layouts] = EBhDisable;
extensionBehavior[GL_ARB_texture_cube_map_array] = EBhDisable;
extensionBehavior[GL_ARB_shader_texture_lod] = EBhDisable;
extensionBehavior[GL_ARB_explicit_attrib_location] = EBhDisable;
extensionBehavior[GL_ARB_shader_image_load_store] = EBhDisable;
extensionBehavior[GL_ARB_shader_atomic_counters] = EBhDisable;
extensionBehavior[GL_ARB_derivative_control] = EBhDisable;
extensionBehavior[GL_ARB_shader_texture_image_samples] = EBhDisable;
extensionBehavior[GL_ARB_viewport_array] = EBhDisable;
// extensionBehavior[GL_ARB_cull_distance] = EBhDisable; // present for 4.5, but need extension control over block members
extensionBehavior[_GL_ARB_texture_rectangle] = EBhDisable;
extensionBehavior[_GL_3DL_array_objects] = EBhDisable;
extensionBehavior[_GL_ARB_shading_language_420pack] = EBhDisable;
extensionBehavior[_GL_ARB_texture_gather] = EBhDisable;
extensionBehavior[_GL_ARB_gpu_shader5] = EBhDisablePartial;
extensionBehavior[_GL_ARB_separate_shader_objects] = EBhDisable;
extensionBehavior[_GL_ARB_compute_shader] = EBhDisablePartial;
extensionBehavior[_GL_ARB_tessellation_shader] = EBhDisable;
extensionBehavior[_GL_ARB_enhanced_layouts] = EBhDisable;
extensionBehavior[_GL_ARB_texture_cube_map_array] = EBhDisable;
extensionBehavior[_GL_ARB_shader_texture_lod] = EBhDisable;
extensionBehavior[_GL_ARB_explicit_attrib_location] = EBhDisable;
extensionBehavior[_GL_ARB_shader_image_load_store] = EBhDisable;
extensionBehavior[_GL_ARB_shader_atomic_counters] = EBhDisable;
extensionBehavior[_GL_ARB_derivative_control] = EBhDisable;
extensionBehavior[_GL_ARB_shader_texture_image_samples] = EBhDisable;
extensionBehavior[_GL_ARB_viewport_array] = EBhDisable;
// extensionBehavior[_GL_ARB_cull_distance] = EBhDisable; // present for 4.5, but need extension control over block members
// AEP
extensionBehavior[GL_ANDROID_extension_pack_es31a] = EBhDisablePartial;
extensionBehavior[GL_KHR_blend_equation_advanced] = EBhDisablePartial;
extensionBehavior[GL_OES_sample_variables] = EBhDisablePartial;
extensionBehavior[GL_OES_shader_image_atomic] = EBhDisablePartial;
extensionBehavior[GL_OES_shader_multisample_interpolation] = EBhDisablePartial;
extensionBehavior[GL_OES_texture_storage_multisample_2d_array] = EBhDisablePartial;
extensionBehavior[GL_EXT_geometry_shader] = EBhDisable;
extensionBehavior[GL_EXT_geometry_point_size] = EBhDisable;
extensionBehavior[GL_EXT_gpu_shader5] = EBhDisablePartial;
extensionBehavior[GL_EXT_primitive_bounding_box] = EBhDisablePartial;
extensionBehavior[GL_EXT_shader_io_blocks] = EBhDisable;
extensionBehavior[GL_EXT_tessellation_shader] = EBhDisable;
extensionBehavior[GL_EXT_tessellation_point_size] = EBhDisable;
extensionBehavior[GL_EXT_texture_buffer] = EBhDisablePartial;
extensionBehavior[GL_EXT_texture_cube_map_array] = EBhDisablePartial;
extensionBehavior[_GL_ANDROID_extension_pack_es31a] = EBhDisablePartial;
extensionBehavior[_GL_KHR_blend_equation_advanced] = EBhDisablePartial;
extensionBehavior[_GL_OES_sample_variables] = EBhDisablePartial;
extensionBehavior[_GL_OES_shader_image_atomic] = EBhDisablePartial;
extensionBehavior[_GL_OES_shader_multisample_interpolation] = EBhDisablePartial;
extensionBehavior[_GL_OES_texture_storage_multisample_2d_array] = EBhDisablePartial;
extensionBehavior[_GL_EXT_geometry_shader] = EBhDisable;
extensionBehavior[_GL_EXT_geometry_point_size] = EBhDisable;
extensionBehavior[_GL_EXT_gpu_shader5] = EBhDisablePartial;
extensionBehavior[_GL_EXT_primitive_bounding_box] = EBhDisablePartial;
extensionBehavior[_GL_EXT_shader_io_blocks] = EBhDisable;
extensionBehavior[_GL_EXT_tessellation_shader] = EBhDisable;
extensionBehavior[_GL_EXT_tessellation_point_size] = EBhDisable;
extensionBehavior[_GL_EXT_texture_buffer] = EBhDisablePartial;
extensionBehavior[_GL_EXT_texture_cube_map_array] = EBhDisablePartial;
// OES matching AEP
extensionBehavior[GL_OES_geometry_shader] = EBhDisable;
extensionBehavior[GL_OES_geometry_point_size] = EBhDisable;
extensionBehavior[GL_OES_gpu_shader5] = EBhDisablePartial;
extensionBehavior[GL_OES_primitive_bounding_box] = EBhDisablePartial;
extensionBehavior[GL_OES_shader_io_blocks] = EBhDisable;
extensionBehavior[GL_OES_tessellation_shader] = EBhDisable;
extensionBehavior[GL_OES_tessellation_point_size] = EBhDisable;
extensionBehavior[GL_OES_texture_buffer] = EBhDisablePartial;
extensionBehavior[GL_OES_texture_cube_map_array] = EBhDisablePartial;
extensionBehavior[_GL_OES_geometry_shader] = EBhDisable;
extensionBehavior[_GL_OES_geometry_point_size] = EBhDisable;
extensionBehavior[_GL_OES_gpu_shader5] = EBhDisablePartial;
extensionBehavior[_GL_OES_primitive_bounding_box] = EBhDisablePartial;
extensionBehavior[_GL_OES_shader_io_blocks] = EBhDisable;
extensionBehavior[_GL_OES_tessellation_shader] = EBhDisable;
extensionBehavior[_GL_OES_tessellation_point_size] = EBhDisable;
extensionBehavior[_GL_OES_texture_buffer] = EBhDisablePartial;
extensionBehavior[_GL_OES_texture_cube_map_array] = EBhDisablePartial;
}
// Get code that is not part of a shared symbol table, is specific to this shader,