Skip to content

D
deprecated-irrlicht-mac
Commit 2fe0df76 authored by hybrid's avatar hybrid
Browse files
Options

Update opengl headers to OpenGL 4.1, add extensions to glext handler. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3459 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 4e586c7a
Hide whitespace changes
Inline Side-by-side
Showing with 1202 additions and 94 deletions
source/Irrlicht/COpenGLExtensionHandler.h
View file @ 2fe0df76
......@@ -82,11 +82,16 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_3DFX_multisample",
"GL_3DFX_tbuffer",
"GL_3DFX_texture_compression_FXT1",
"GL_AMD_conservative_depth",
"GL_AMD_debug_output",
"GL_AMD_depth_clamp_separate",
"GL_AMD_draw_buffers_blend",
"GL_AMD_name_gen_delete",
"GL_AMD_performance_monitor",
"GL_AMD_seamless_cubemap_per_texture",
"GL_AMD_shader_stencil_export",
"GL_AMD_texture_texture4",
"GL_AMD_transform_feedback3_lines_triangles",
"GL_AMD_vertex_shader_tesselator",
"GL_APPLE_aux_depth_stencil",
"GL_APPLE_client_storage",
......@@ -105,9 +110,11 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_APPLE_vertex_program_evaluators",
"GL_APPLE_ycbcr_422",
"GL_ARB_blend_func_extended",
"GL_ARB_cl_event",
"GL_ARB_color_buffer_float",
"GL_ARB_compatibility",
"GL_ARB_copy_buffer",
"GL_ARB_debug_output",
"GL_ARB_depth_buffer_float",
"GL_ARB_depth_clamp",
"GL_ARB_depth_texture",
......@@ -116,13 +123,17 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_ARB_draw_elements_base_vertex",
"GL_ARB_draw_indirect",
"GL_ARB_draw_instanced",
"GL_ARB_ES2_compatibility",
"GL_ARB_explicit_attrib_location",
"GL_ARB_fragment_coord_conventions",
"GL_ARB_fragment_program",
"GL_ARB_fragment_program_shadow",
"GL_ARB_fragment_shader",
"GL_ARB_framebuffer_object",
"GL_ARB_framebuffer_sRGB",
"GL_ARB_get_program_binary",
"GL_ARB_geometry_shader4",
"GL_ARB_gpu_shader5",
"GL_ARB_gpu_shader_fp64",
"GL_ARB_half_float_pixel",
"GL_ARB_half_float_vertex",
......@@ -133,14 +144,19 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_ARB_multisample",
"GL_ARB_multitexture",
"GL_ARB_occlusion_query",
"GL_ARB_occlusion_query2",
"GL_ARB_pixel_buffer_object",
"GL_ARB_point_parameters",
"GL_ARB_point_sprite",
"GL_ARB_provoking_vertex",
"GL_ARB_robustness",
"GL_ARB_sample_shading",
"GL_ARB_sampler_objects",
"GL_ARB_seamless_cube_map",
"GL_ARB_separate_shader_objects",
"GL_ARB_shader_objects",
"GL_ARB_shader_precision",
"GL_ARB_shader_stencil_export",
"GL_ARB_shader_subroutine",
"GL_ARB_shader_texture_lod",
"GL_ARB_shading_language_100",
......@@ -151,7 +167,9 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_ARB_tessellation_shader",
"GL_ARB_texture_border_clamp",
"GL_ARB_texture_buffer_object",
"GL_ARB_texture_buffer_object_rgb32",
"GL_ARB_texture_compression",
"GL_ARB_texture_compression_bptc",
"GL_ARB_texture_compression_rgtc",
"GL_ARB_texture_cube_map",
"GL_ARB_texture_cube_map_array",
......@@ -167,6 +185,8 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_ARB_texture_query_lod",
"GL_ARB_texture_rectangle",
"GL_ARB_texture_rg",
"GL_ARB_texture_rgb10_a2ui",
"GL_ARB_texture_swizzle",
"GL_ARB_timer_query",
"GL_ARB_transform_feedback2",
"GL_ARB_transform_feedback3",
......@@ -174,11 +194,13 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_ARB_uniform_buffer_object",
"GL_ARB_vertex_array_bgra",
"GL_ARB_vertex_array_object",
"GL_ARB_vertex_attrib_64bit",
"GL_ARB_vertex_blend",
"GL_ARB_vertex_buffer_object",
"GL_ARB_vertex_program",
"GL_ARB_vertex_shader",
"GL_ARB_vertex_type_2_10_10_10_rev",
"GL_ARB_viewport_array",
"GL_ARB_window_pos",
"GL_ATI_draw_buffers",
"GL_ATI_element_array",
......@@ -250,6 +272,7 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_EXT_secondary_color",
"GL_EXT_separate_shader_objects",
"GL_EXT_separate_specular_color",
"GL_EXT_shader_image_load_store",
"GL_EXT_shadow_funcs",
"GL_EXT_shared_texture_palette",
"GL_EXT_stencil_clear_tag",
......@@ -281,6 +304,7 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_EXT_transform_feedback",
"GL_EXT_vertex_array",
"GL_EXT_vertex_array_bgra",
"GL_EXT_vertex_attrib_64bit",
"GL_EXT_vertex_shader",
"GL_EXT_vertex_weighting",
"GL_FfdMaskSGIX",
......@@ -325,8 +349,11 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_NV_geometry_program4",
"GL_NV_geometry_shader4",
"GL_NV_gpu_program4",
"GL_NV_gpu_program5",
"GL_NV_gpu_shader5",
"GL_NV_half_float",
"GL_NV_light_max_exponent",
"GL_NV_multisample_coverage",
"GL_NV_multisample_filter_hint",
"GL_NV_occlusion_query",
"GL_NV_packed_depth_stencil",
......@@ -339,6 +366,8 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_NV_register_combiners",
"GL_NV_register_combiners2",
"GL_NV_shader_buffer_load",
"GL_NV_shader_buffer_store",
"GL_NV_tessellation_program5",
"GL_NV_texgen_emboss",
"GL_NV_texgen_reflection",
"GL_NV_texture_barrier",
......@@ -351,8 +380,10 @@ static const char* const OpenGLFeatureStrings[] = {
"GL_NV_texture_shader3",
"GL_NV_transform_feedback",
"GL_NV_transform_feedback2",
"GL_NV_vdpau_interop",
"GL_NV_vertex_array_range",
"GL_NV_vertex_array_range2",
"GL_NV_vertex_attrib_integer_64bit",
"GL_NV_vertex_buffer_unified_memory",
"GL_NV_vertex_program",
"GL_NV_vertex_program1_1",
......@@ -450,11 +481,16 @@ class COpenGLExtensionHandler
IRR_3DFX_multisample = 0,
IRR_3DFX_tbuffer,
IRR_3DFX_texture_compression_FXT1,
IRR_AMD_conservative_depth,
IRR_AMD_debug_output,
IRR_AMD_depth_clamp_separate,
IRR_AMD_draw_buffers_blend,
IRR_AMD_name_gen_delete,
IRR_AMD_performance_monitor,
IRR_AMD_seamless_cubemap_per_texture,
IRR_AMD_shader_stencil_export,
IRR_AMD_texture_texture4,
IRR_AMD_transform_feedback3_lines_triangles,
IRR_AMD_vertex_shader_tesselator,
IRR_APPLE_aux_depth_stencil,
IRR_APPLE_client_storage,
......@@ -473,9 +509,11 @@ class COpenGLExtensionHandler
IRR_APPLE_vertex_program_evaluators,
IRR_APPLE_ycbcr_422,
IRR_ARB_blend_func_extended,
IRR_ARB_cl_event,
IRR_ARB_color_buffer_float,
IRR_ARB_compatibility,
IRR_ARB_copy_buffer,
IRR_ARB_debug_output,
IRR_ARB_depth_buffer_float,
IRR_ARB_depth_clamp,
IRR_ARB_depth_texture,
......@@ -484,6 +522,8 @@ class COpenGLExtensionHandler
IRR_ARB_draw_elements_base_vertex,
IRR_ARB_draw_indirect,
IRR_ARB_draw_instanced,
IRR_ARB_ES2_compatibility,
IRR_ARB_explicit_attrib_location,
IRR_ARB_fragment_coord_conventions,
IRR_ARB_fragment_program,
IRR_ARB_fragment_program_shadow,
......@@ -491,6 +531,8 @@ class COpenGLExtensionHandler
IRR_ARB_framebuffer_object,
IRR_ARB_framebuffer_sRGB,
IRR_ARB_geometry_shader4,
IRR_ARB_get_program_binary,
IRR_ARB_gpu_shader5,
IRR_ARB_gpu_shader_fp64,
IRR_ARB_half_float_pixel,
IRR_ARB_half_float_vertex,
......@@ -501,14 +543,19 @@ class COpenGLExtensionHandler
IRR_ARB_multisample,
IRR_ARB_multitexture,
IRR_ARB_occlusion_query,
IRR_ARB_occlusion_query2,
IRR_ARB_pixel_buffer_object,
IRR_ARB_point_parameters,
IRR_ARB_point_sprite,
IRR_ARB_provoking_vertex,
IRR_ARB_robustness,
IRR_ARB_sample_shading,
IRR_ARB_sampler_objects,
IRR_ARB_seamless_cube_map,
IRR_ARB_separate_shader_objects,
IRR_ARB_shader_objects,
IRR_ARB_shader_precision,
IRR_ARB_shader_stencil_export,
IRR_ARB_shader_subroutine,
IRR_ARB_shader_texture_lod,
IRR_ARB_shading_language_100,
......@@ -519,7 +566,9 @@ class COpenGLExtensionHandler
IRR_ARB_tessellation_shader,
IRR_ARB_texture_border_clamp,
IRR_ARB_texture_buffer_object,
IRR_ARB_texture_buffer_object_rgb32,
IRR_ARB_texture_compression,
IRR_ARB_texture_compression_bptc,
IRR_ARB_texture_compression_rgtc,
IRR_ARB_texture_cube_map,
IRR_ARB_texture_cube_map_array,
......@@ -535,6 +584,8 @@ class COpenGLExtensionHandler
IRR_ARB_texture_query_lod,
IRR_ARB_texture_rectangle,
IRR_ARB_texture_rg,
IRR_ARB_texture_rgb10_a2ui,
IRR_ARB_texture_swizzle,
IRR_ARB_timer_query,
IRR_ARB_transform_feedback2,
IRR_ARB_transform_feedback3,
......@@ -542,11 +593,13 @@ class COpenGLExtensionHandler
IRR_ARB_uniform_buffer_object,
IRR_ARB_vertex_array_bgra,
IRR_ARB_vertex_array_object,
IRR_ARB_vertex_attrib_64bit,
IRR_ARB_vertex_blend,
IRR_ARB_vertex_buffer_object,
IRR_ARB_vertex_program,
IRR_ARB_vertex_shader,
IRR_ARB_vertex_type_2_10_10_10_rev,
IRR_ARB_viewport_array,
IRR_ARB_window_pos,
IRR_ATI_draw_buffers,
IRR_ATI_element_array,
......@@ -618,6 +671,7 @@ class COpenGLExtensionHandler
IRR_EXT_secondary_color,
IRR_EXT_separate_shader_objects,
IRR_EXT_separate_specular_color,
IRR_EXT_shader_image_load_store,
IRR_EXT_shadow_funcs,
IRR_EXT_shared_texture_palette,
IRR_EXT_stencil_clear_tag,
......@@ -649,6 +703,7 @@ class COpenGLExtensionHandler
IRR_EXT_transform_feedback,
IRR_EXT_vertex_array,
IRR_EXT_vertex_array_bgra,
IRR_EXT_vertex_attrib_64bit,
IRR_EXT_vertex_shader,
IRR_EXT_vertex_weighting,
IRR_FfdMaskSGIX,
......@@ -693,8 +748,11 @@ class COpenGLExtensionHandler
IRR_NV_geometry_program4,
IRR_NV_geometry_shader4,
IRR_NV_gpu_program4,
IRR_NV_gpu_program5,
IRR_NV_gpu_shader5,
IRR_NV_half_float,
IRR_NV_light_max_exponent,
IRR_NV_multisample_coverage,
IRR_NV_multisample_filter_hint,
IRR_NV_occlusion_query,
IRR_NV_packed_depth_stencil,
......@@ -707,6 +765,8 @@ class COpenGLExtensionHandler
IRR_NV_register_combiners,
IRR_NV_register_combiners2,
IRR_NV_shader_buffer_load,
IRR_NV_shader_buffer_store,
IRR_NV_tessellation_program5,
IRR_NV_texgen_emboss,
IRR_NV_texgen_reflection,
IRR_NV_texture_barrier,
......@@ -719,8 +779,10 @@ class COpenGLExtensionHandler
IRR_NV_texture_shader3,
IRR_NV_transform_feedback,
IRR_NV_transform_feedback2,
IRR_NV_vdpau_interop,
IRR_NV_vertex_array_range,
IRR_NV_vertex_array_range2,
IRR_NV_vertex_attrib_integer_64bit,
IRR_NV_vertex_buffer_unified_memory,
IRR_NV_vertex_program,
IRR_NV_vertex_program1_1,
......
source/Irrlicht/glext.h
View file @ 2fe0df76
This source diff could not be displayed because it is too large. You can view the blob instead.
source/Irrlicht/glxext.h
View file @ 2fe0df76
......@@ -48,9 +48,9 @@ extern "C" {
/*************************************************************/
/* Header file version number, required by OpenGL ABI for Linux */
/* glxext.h last updated 2010/02/10 */
/* glxext.h last updated 2010/08/06 */
/* Current version at http://www.opengl.org/registry/ */
#define GLX_GLXEXT_VERSION 27
#define GLX_GLXEXT_VERSION 32
#ifndef GLX_VERSION_1_3
#define GLX_WINDOW_BIT 0x00000001
......@@ -124,11 +124,19 @@ extern "C" {
#define GLX_SAMPLES_ARB 100001
#endif
#ifndef GLX_ARB_vertex_buffer_object
#define GLX_CONTEXT_ALLOW_BUFFER_BYTE_ORDER_MISMATCH_ARB 0x2095
#endif
#ifndef GLX_ARB_fbconfig_float
#define GLX_RGBA_FLOAT_TYPE_ARB 0x20B9
#define GLX_RGBA_FLOAT_BIT_ARB 0x00000004
#endif
#ifndef GLX_ARB_framebuffer_sRGB
#define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2
#endif
#ifndef GLX_ARB_create_context
#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001
#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
......@@ -143,6 +151,13 @@ extern "C" {
#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
#endif
#ifndef GLX_ARB_create_context_robustness
#define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
#define GLX_LOSE_CONTEXT_ON_RESET_ARB 0x8252
#define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
#define GLX_NO_RESET_NOTIFICATION_ARB 0x8261
#endif
#ifndef GLX_SGIS_multisample
#define GLX_SAMPLE_BUFFERS_SGIS 100000
#define GLX_SAMPLES_SGIS 100001
......@@ -403,6 +418,28 @@ extern "C" {
#define GLX_FLIP_COMPLETE_INTEL 0x8182
#endif
#ifndef GLX_NV_multisample_coverage
#define GLX_COVERAGE_SAMPLES_NV 100001
#define GLX_COLOR_SAMPLES_NV 0x20B3
#endif
#ifndef GLX_AMD_gpu_association
#define GLX_GPU_VENDOR_AMD 0x1F00
#define GLX_GPU_RENDERER_STRING_AMD 0x1F01
#define GLX_GPU_OPENGL_VERSION_STRING_AMD 0x1F02
#define GLX_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2
#define GLX_GPU_RAM_AMD 0x21A3
#define GLX_GPU_CLOCK_AMD 0x21A4
#define GLX_GPU_NUM_PIPES_AMD 0x21A5
#define GLX_GPU_NUM_SIMD_AMD 0x21A6
#define GLX_GPU_NUM_RB_AMD 0x21A7
#define GLX_GPU_NUM_SPI_AMD 0x21A8
#endif
#ifndef GLX_EXT_create_context_es2_profile
#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
#endif
/*************************************************************/
......@@ -547,6 +584,10 @@ typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procNam
#define GLX_ARB_fbconfig_float 1
#endif
#ifndef GLX_ARB_framebuffer_sRGB
#define GLX_ARB_framebuffer_sRGB 1
#endif
#ifndef GLX_ARB_create_context
#define GLX_ARB_create_context 1
#ifdef GLX_GLXEXT_PROTOTYPES
......@@ -559,6 +600,10 @@ typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display *dpy, GLXFBCo
#define GLX_ARB_create_context_profile 1
#endif
#ifndef GLX_ARB_create_context_robustness
#define GLX_ARB_create_context_robustness 1
#endif
#ifndef GLX_SGIS_multisample
#define GLX_SGIS_multisample 1
#endif
......@@ -936,6 +981,10 @@ typedef void ( * PFNGLXCOPYIMAGESUBDATANVPROC) (Display *dpy, GLXContext srcCtx,
#define GLX_INTEL_swap_event 1
#endif
#ifndef GLX_NV_multisample_coverage
#define GLX_NV_multisample_coverage 1
#endif
#ifdef __cplusplus
}
......
source/Irrlicht/wglext.h
View file @ 2fe0df76
......@@ -48,9 +48,9 @@ extern "C" {
/*************************************************************/
/* Header file version number */
/* wglext.h last updated 2010/02/10 */
/* wglext.h last updated 2010/08/06 */
/* Current version at http://www.opengl.org/registry/ */
#define WGL_WGLEXT_VERSION 18
#define WGL_WGLEXT_VERSION 22
#ifndef WGL_ARB_buffer_region
#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
......@@ -175,6 +175,10 @@ extern "C" {
#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0
#endif
#ifndef WGL_ARB_framebuffer_sRGB
#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9
#endif
#ifndef WGL_ARB_create_context
#define WGL_CONTEXT_DEBUG_BIT_ARB 0x00000001
#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002
......@@ -192,6 +196,13 @@ extern "C" {
#define ERROR_INVALID_PROFILE_ARB 0x2096
#endif
#ifndef WGL_ARB_create_context_robustness
#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004
#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252
#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261
#endif
#ifndef WGL_EXT_make_current_read
#define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043
#endif
......@@ -388,12 +399,21 @@ extern "C" {
#define WGL_GPU_NUM_SPI_AMD 0x21A8
#endif
#ifndef NV_video_capture
#ifndef WGL_NV_video_capture
#define WGL_UNIQUE_ID_NV 0x20CE
#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF
#endif
#ifndef NV_copy_image
#ifndef WGL_NV_copy_image
#endif
#ifndef WGL_NV_multisample_coverage
#define WGL_COVERAGE_SAMPLES_NV 0x2042
#define WGL_COLOR_SAMPLES_NV 0x20B9
#endif
#ifndef WGL_EXT_create_context_es2_profile
#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004
#endif
......@@ -507,6 +527,10 @@ typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, con
#define WGL_ARB_pixel_format_float 1
#endif
#ifndef WGL_ARB_framebuffer_sRGB
#define WGL_ARB_framebuffer_sRGB 1
#endif
#ifndef WGL_ARB_create_context
#define WGL_ARB_create_context 1
#ifdef WGL_WGLEXT_PROTOTYPES
......@@ -519,6 +543,10 @@ typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShar
#define WGL_ARB_create_context_profile 1
#endif
#ifndef WGL_ARB_create_context_robustness
#define WGL_ARB_create_context_robustness 1
#endif
#ifndef WGL_EXT_display_color_table
#define WGL_EXT_display_color_table 1
#ifdef WGL_WGLEXT_PROTOTYPES
......@@ -861,6 +889,10 @@ extern BOOL WINAPI wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum s
typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
#endif
#ifndef WGL_NV_multisample_coverage
#define WGL_NV_multisample_coverage 1
#endif
#ifdef __cplusplus
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment