From 604981a8132338f3a5ae45f49f35f1bcfc4c3c1f Mon Sep 17 00:00:00 2001 From: cutealien Date: Tue, 7 Jan 2014 23:23:29 +0000 Subject: [PATCH] Merge r4571 from trunk: Update to latest glext headers, add new extension strings, fix one order bug NOTE: Latest glext headers had already been in this branch, so only other patches applied. git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4644 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/COpenGLExtensionHandler.h | 111 +++++++++++++++++++--- source/Irrlicht/glxext.h | 38 +++++++- source/Irrlicht/wglext.h | 20 +++- 3 files changed, 149 insertions(+), 20 deletions(-) diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h index ec942ae8..fb78cc8a 100644 --- a/source/Irrlicht/COpenGLExtensionHandler.h +++ b/source/Irrlicht/COpenGLExtensionHandler.h @@ -83,7 +83,6 @@ namespace irr namespace video { - static const char* const OpenGLFeatureStrings[] = { "GL_3DFX_multisample", "GL_3DFX_tbuffer", @@ -96,12 +95,19 @@ static const char* const OpenGLFeatureStrings[] = { "GL_AMD_multi_draw_indirect", "GL_AMD_name_gen_delete", "GL_AMD_performance_monitor", + "GL_AMD_pinned_memory", + "GL_AMD_query_buffer_object", "GL_AMD_sample_positions", "GL_AMD_seamless_cubemap_per_texture", "GL_AMD_shader_stencil_export", + "GL_AMD_shader_trinary_minmax", + "GL_AMD_sparse_texture", + "GL_AMD_stencil_operation_extended", "GL_AMD_texture_texture4", "GL_AMD_transform_feedback3_lines_triangles", - "GL_AMD_vertex_shader_tesselator", + "GL_AMD_vertex_shader_layer", + "GL_AMD_vertex_shader_tessellator", + "GL_AMD_vertex_shader_viewport_index", "GL_APPLE_aux_depth_stencil", "GL_APPLE_client_storage", "GL_APPLE_element_array", @@ -118,14 +124,19 @@ static const char* const OpenGLFeatureStrings[] = { "GL_APPLE_vertex_array_range", "GL_APPLE_vertex_program_evaluators", "GL_APPLE_ycbcr_422", + "GL_ARB_ES3_compatibility", + "GL_ARB_arrays_of_arrays", "GL_ARB_base_instance", "GL_ARB_blend_func_extended", "GL_ARB_cl_event", + "GL_ARB_clear_buffer_object", "GL_ARB_color_buffer_float", "GL_ARB_compatibility", "GL_ARB_compressed_texture_pixel_storage", + "GL_ARB_compute_shader", "GL_ARB_conservative_depth", "GL_ARB_copy_buffer", + "GL_ARB_copy_image", "GL_ARB_debug_output", "GL_ARB_depth_buffer_float", "GL_ARB_depth_clamp", @@ -138,14 +149,17 @@ static const char* const OpenGLFeatureStrings[] = { "GL_ARB_ES2_compatibility", "GL_ARB_ES3_compatibility", "GL_ARB_explicit_attrib_location", + "GL_ARB_explicit_uniform_location", "GL_ARB_fragment_coord_conventions", + "GL_ARB_fragment_layer_viewport", "GL_ARB_fragment_program", "GL_ARB_fragment_program_shadow", "GL_ARB_fragment_shader", + "GL_ARB_framebuffer_no_attachments", "GL_ARB_framebuffer_object", "GL_ARB_framebuffer_sRGB", - "GL_ARB_get_program_binary", "GL_ARB_geometry_shader4", + "GL_ARB_get_program_binary", "GL_ARB_gpu_shader5", "GL_ARB_gpu_shader_fp64", "GL_ARB_half_float_pixel", @@ -153,9 +167,12 @@ static const char* const OpenGLFeatureStrings[] = { "GL_ARB_imaging", "GL_ARB_instanced_arrays", "GL_ARB_internalformat_query", + "GL_ARB_internalformat_query2", + "GL_ARB_invalidate_subdata", "GL_ARB_map_buffer_alignment", "GL_ARB_map_buffer_range", "GL_ARB_matrix_palette", + "GL_ARB_multi_draw_indirect", "GL_ARB_multisample", "GL_ARB_multitexture", "GL_ARB_occlusion_query", @@ -163,8 +180,11 @@ static const char* const OpenGLFeatureStrings[] = { "GL_ARB_pixel_buffer_object", "GL_ARB_point_parameters", "GL_ARB_point_sprite", + "GL_ARB_program_interface_query", "GL_ARB_provoking_vertex", + "GL_ARB_robust_buffer_access_behavior", "GL_ARB_robustness", + "GL_ARB_robustness_isolation", "GL_ARB_sample_shading", "GL_ARB_sampler_objects", "GL_ARB_seamless_cube_map", @@ -172,9 +192,11 @@ static const char* const OpenGLFeatureStrings[] = { "GL_ARB_shader_atomic_counters", "GL_ARB_shader_bit_encoding", "GL_ARB_shader_image_load_store", + "GL_ARB_shader_image_size", "GL_ARB_shader_objects", "GL_ARB_shader_precision", "GL_ARB_shader_stencil_export", + "GL_ARB_shader_storage_buffer_object", "GL_ARB_shader_subroutine", "GL_ARB_shader_texture_lod", "GL_ARB_shading_language_100", @@ -183,11 +205,13 @@ static const char* const OpenGLFeatureStrings[] = { "GL_ARB_shading_language_packing", "GL_ARB_shadow", "GL_ARB_shadow_ambient", + "GL_ARB_stencil_texturing", "GL_ARB_sync", "GL_ARB_tessellation_shader", "GL_ARB_texture_border_clamp", "GL_ARB_texture_buffer_object", "GL_ARB_texture_buffer_object_rgb32", + "GL_ARB_texture_buffer_range", "GL_ARB_texture_compression", "GL_ARB_texture_compression_bptc", "GL_ARB_texture_compression_rgtc", @@ -202,12 +226,15 @@ static const char* const OpenGLFeatureStrings[] = { "GL_ARB_texture_mirrored_repeat", "GL_ARB_texture_multisample", "GL_ARB_texture_non_power_of_two", + "GL_ARB_texture_query_levels", "GL_ARB_texture_query_lod", "GL_ARB_texture_rectangle", "GL_ARB_texture_rg", "GL_ARB_texture_rgb10_a2ui", "GL_ARB_texture_storage", + "GL_ARB_texture_storage_multisample", "GL_ARB_texture_swizzle", + "GL_ARB_texture_view", "GL_ARB_timer_query", "GL_ARB_transform_feedback2", "GL_ARB_transform_feedback3", @@ -217,6 +244,7 @@ static const char* const OpenGLFeatureStrings[] = { "GL_ARB_vertex_array_bgra", "GL_ARB_vertex_array_object", "GL_ARB_vertex_attrib_64bit", + "GL_ARB_vertex_attrib_binding", "GL_ARB_vertex_blend", "GL_ARB_vertex_buffer_object", "GL_ARB_vertex_program", @@ -332,7 +360,6 @@ static const char* const OpenGLFeatureStrings[] = { "GL_EXT_vertex_shader", "GL_EXT_vertex_weighting", "GL_EXT_x11_sync_object", - "GL_FfdMaskSGIX", "GL_GREMEDY_frame_terminator", "GL_GREMEDY_string_marker", "GL_HP_convolution_border_modes", @@ -342,25 +369,34 @@ static const char* const OpenGLFeatureStrings[] = { "GL_IBM_cull_vertex", "GL_IBM_multimode_draw_arrays", "GL_IBM_rasterpos_clip", + "GL_IBM_static_data", "GL_IBM_texture_mirrored_repeat", "GL_IBM_vertex_array_lists", "GL_INGR_blend_func_separate", "GL_INGR_color_clamp", "GL_INGR_interlace_read", "GL_INGR_palette_buffer", + "GL_INTEL_map_texture", "GL_INTEL_parallel_arrays", "GL_INTEL_texture_scissor", + "GL_KHR_debug", + "GL_KHR_texture_compression_astc_ldr", "GL_MESA_pack_invert", "GL_MESA_resize_buffers", "GL_MESA_window_pos", "GL_MESAX_texture_stack", "GL_MESA_ycbcr_texture", + "GL_NVX_conditional_render", + "GL_NV_bindless_texture", "GL_NV_blend_square", + "GL_NV_compute_program5", "GL_NV_conditional_render", "GL_NV_copy_depth_to_color", "GL_NV_copy_image", + "GL_NV_deep_texture3D", "GL_NV_depth_buffer_float", "GL_NV_depth_clamp", + "GL_NV_draw_texture", "GL_NV_evaluators", "GL_NV_explicit_multisample", "GL_NV_fence", @@ -384,14 +420,18 @@ static const char* const OpenGLFeatureStrings[] = { "GL_NV_packed_depth_stencil", "GL_NV_parameter_buffer_object", "GL_NV_parameter_buffer_object2", + "GL_NV_path_rendering", "GL_NV_pixel_data_range", "GL_NV_point_sprite", "GL_NV_present_video", "GL_NV_primitive_restart", "GL_NV_register_combiners", "GL_NV_register_combiners2", + "GL_NV_shader_atomic_counters", + "GL_NV_shader_atomic_float", "GL_NV_shader_buffer_load", "GL_NV_shader_buffer_store", + "GL_NV_shader_storage_buffer_object", "GL_NV_tessellation_program5", "GL_NV_texgen_emboss", "GL_NV_texgen_reflection", @@ -418,7 +458,12 @@ static const char* const OpenGLFeatureStrings[] = { "GL_NV_vertex_program3", "GL_NV_vertex_program4", "GL_NV_video_capture", + "GL_OES_byte_coordinates", + "GL_OES_compressed_paletted_texture", + "GL_OES_fixed_point", + "GL_OES_query_matrix", "GL_OES_read_format", + "GL_OES_single_precision", "GL_OML_interlace", "GL_OML_resample", "GL_OML_subsample", @@ -428,7 +473,7 @@ static const char* const OpenGLFeatureStrings[] = { "GL_S3_s3tc", "GL_SGI_color_matrix", "GL_SGI_color_table", - "GL_SGI_depth_pass_instrument", + "GL_SGI_texture_color_table", "GL_SGIS_detail_texture", "GL_SGIS_fog_function", "GL_SGIS_generate_mipmap", @@ -444,7 +489,6 @@ static const char* const OpenGLFeatureStrings[] = { "GL_SGIS_texture_filter4", "GL_SGIS_texture_lod", "GL_SGIS_texture_select", - "GL_SGI_texture_color_table", "GL_SGIX_async", "GL_SGIX_async_histogram", "GL_SGIX_async_pixel", @@ -460,7 +504,6 @@ static const char* const OpenGLFeatureStrings[] = { "GL_SGIX_fragment_lighting", "GL_SGIX_framezoom", "GL_SGIX_igloo_interface", - "GL_SGIX_impact_pixel_texture", "GL_SGIX_instruments", "GL_SGIX_interlace", "GL_SGIX_ir_instrument1", @@ -481,7 +524,6 @@ static const char* const OpenGLFeatureStrings[] = { "GL_SGIX_texture_lod_bias", "GL_SGIX_texture_multi_buffer", "GL_SGIX_texture_scale_bias", - "GL_SGIX_texture_select", "GL_SGIX_vertex_preclip", "GL_SGIX_ycrcb", "GL_SGIX_ycrcba", @@ -515,12 +557,19 @@ class COpenGLExtensionHandler IRR_AMD_multi_draw_indirect, IRR_AMD_name_gen_delete, IRR_AMD_performance_monitor, + IRR_AMD_pinned_memory, + IRR_AMD_query_buffer_object, IRR_AMD_sample_positions, IRR_AMD_seamless_cubemap_per_texture, IRR_AMD_shader_stencil_export, + IRR_AMD_shader_trinary_minmax, + IRR_AMD_sparse_texture, + IRR_AMD_stencil_operation_extended, IRR_AMD_texture_texture4, IRR_AMD_transform_feedback3_lines_triangles, - IRR_AMD_vertex_shader_tesselator, + IRR_AMD_vertex_shader_layer, + IRR_AMD_vertex_shader_tessellator, + IRR_AMD_vertex_shader_viewport_index, IRR_APPLE_aux_depth_stencil, IRR_APPLE_client_storage, IRR_APPLE_element_array, @@ -537,14 +586,19 @@ class COpenGLExtensionHandler IRR_APPLE_vertex_array_range, IRR_APPLE_vertex_program_evaluators, IRR_APPLE_ycbcr_422, + IRR_ARB_ES3_compatibility, + IRR_ARB_arrays_of_arrays, IRR_ARB_base_instance, IRR_ARB_blend_func_extended, IRR_ARB_cl_event, + IRR_ARB_clear_buffer_object, IRR_ARB_color_buffer_float, IRR_ARB_compatibility, IRR_ARB_compressed_texture_pixel_storage, + IRR_ARB_compute_shader, IRR_ARB_conservative_depth, IRR_ARB_copy_buffer, + IRR_ARB_copy_image, IRR_ARB_debug_output, IRR_ARB_depth_buffer_float, IRR_ARB_depth_clamp, @@ -557,11 +611,14 @@ class COpenGLExtensionHandler IRR_ARB_ES2_compatibility, IRR_ARB_ES3_compatibility, IRR_ARB_explicit_attrib_location, + IRR_ARB_explicit_uniform_location, IRR_ARB_fragment_coord_conventions, + IRR_ARB_fragment_layer_viewport, IRR_ARB_fragment_program, IRR_ARB_fragment_program_shadow, IRR_ARB_fragment_shader, IRR_ARB_framebuffer_object, + IRR_ARB_framebuffer_no_attachments, IRR_ARB_framebuffer_sRGB, IRR_ARB_geometry_shader4, IRR_ARB_get_program_binary, @@ -572,9 +629,12 @@ class COpenGLExtensionHandler IRR_ARB_imaging, IRR_ARB_instanced_arrays, IRR_ARB_internalformat_query, + IRR_ARB_internalformat_query2, + IRR_ARB_invalidate_subdata, IRR_ARB_map_buffer_alignment, IRR_ARB_map_buffer_range, IRR_ARB_matrix_palette, + IRR_ARB_multi_draw_indirect, IRR_ARB_multisample, IRR_ARB_multitexture, IRR_ARB_occlusion_query, @@ -582,8 +642,11 @@ class COpenGLExtensionHandler IRR_ARB_pixel_buffer_object, IRR_ARB_point_parameters, IRR_ARB_point_sprite, + IRR_ARB_program_interface_query, IRR_ARB_provoking_vertex, + IRR_ARB_robust_buffer_access_behavior, IRR_ARB_robustness, + IRR_ARB_robustness_isolation, IRR_ARB_sample_shading, IRR_ARB_sampler_objects, IRR_ARB_seamless_cube_map, @@ -591,9 +654,11 @@ class COpenGLExtensionHandler IRR_ARB_shader_atomic_counters, IRR_ARB_shader_bit_encoding, IRR_ARB_shader_image_load_store, + IRR_ARB_shader_image_size, IRR_ARB_shader_objects, IRR_ARB_shader_precision, IRR_ARB_shader_stencil_export, + IRR_ARB_shader_storage_buffer_object, IRR_ARB_shader_subroutine, IRR_ARB_shader_texture_lod, IRR_ARB_shading_language_100, @@ -602,11 +667,13 @@ class COpenGLExtensionHandler IRR_ARB_shading_language_packing, IRR_ARB_shadow, IRR_ARB_shadow_ambient, + IRR_ARB_stencil_texturing, IRR_ARB_sync, IRR_ARB_tessellation_shader, IRR_ARB_texture_border_clamp, IRR_ARB_texture_buffer_object, IRR_ARB_texture_buffer_object_rgb32, + IRR_ARB_texture_buffer_range, IRR_ARB_texture_compression, IRR_ARB_texture_compression_bptc, IRR_ARB_texture_compression_rgtc, @@ -621,12 +688,15 @@ class COpenGLExtensionHandler IRR_ARB_texture_mirrored_repeat, IRR_ARB_texture_multisample, IRR_ARB_texture_non_power_of_two, + IRR_ARB_texture_query_levels, IRR_ARB_texture_query_lod, IRR_ARB_texture_rectangle, IRR_ARB_texture_rg, IRR_ARB_texture_rgb10_a2ui, IRR_ARB_texture_storage, + IRR_ARB_texture_storage_multisample, IRR_ARB_texture_swizzle, + IRR_ARB_texture_view, IRR_ARB_timer_query, IRR_ARB_transform_feedback2, IRR_ARB_transform_feedback3, @@ -636,6 +706,7 @@ class COpenGLExtensionHandler IRR_ARB_vertex_array_bgra, IRR_ARB_vertex_array_object, IRR_ARB_vertex_attrib_64bit, + IRR_ARB_vertex_attrib_binding, IRR_ARB_vertex_blend, IRR_ARB_vertex_buffer_object, IRR_ARB_vertex_program, @@ -751,7 +822,6 @@ class COpenGLExtensionHandler IRR_EXT_vertex_shader, IRR_EXT_vertex_weighting, IRR_EXT_x11_sync_object, - IRR_FfdMaskSGIX, IRR_GREMEDY_frame_terminator, IRR_GREMEDY_string_marker, IRR_HP_convolution_border_modes, @@ -761,25 +831,34 @@ class COpenGLExtensionHandler IRR_IBM_cull_vertex, IRR_IBM_multimode_draw_arrays, IRR_IBM_rasterpos_clip, + IRR_IBM_static_data, IRR_IBM_texture_mirrored_repeat, IRR_IBM_vertex_array_lists, IRR_INGR_blend_func_separate, IRR_INGR_color_clamp, IRR_INGR_interlace_read, IRR_INGR_palette_buffer, + IRR_INTEL_map_texture, IRR_INTEL_parallel_arrays, IRR_INTEL_texture_scissor, + IRR_KHR_debug, + IRR_KHR_texture_compression_astc_ldr, IRR_MESA_pack_invert, IRR_MESA_resize_buffers, IRR_MESA_window_pos, IRR_MESAX_texture_stack, IRR_MESA_ycbcr_texture, + IRR_NVX_conditional_render, + IRR_NV_bindless_texture, IRR_NV_blend_square, + IRR_NV_compute_program5, IRR_NV_conditional_render, IRR_NV_copy_depth_to_color, IRR_NV_copy_image, + IRR_NV_deep_texture3D, IRR_NV_depth_buffer_float, IRR_NV_depth_clamp, + IRR_NV_draw_texture, IRR_NV_evaluators, IRR_NV_explicit_multisample, IRR_NV_fence, @@ -803,14 +882,18 @@ class COpenGLExtensionHandler IRR_NV_packed_depth_stencil, IRR_NV_parameter_buffer_object, IRR_NV_parameter_buffer_object2, + IRR_NV_path_rendering, IRR_NV_pixel_data_range, IRR_NV_point_sprite, IRR_NV_present_video, IRR_NV_primitive_restart, IRR_NV_register_combiners, IRR_NV_register_combiners2, + IRR_NV_shader_atomic_counters, + IRR_NV_shader_atomic_float, IRR_NV_shader_buffer_load, IRR_NV_shader_buffer_store, + IRR_NV_shader_storage_buffer_object, IRR_NV_tessellation_program5, IRR_NV_texgen_emboss, IRR_NV_texgen_reflection, @@ -837,7 +920,12 @@ class COpenGLExtensionHandler IRR_NV_vertex_program3, IRR_NV_vertex_program4, IRR_NV_video_capture, + IRR_OES_byte_coordinates, + IRR_OES_compressed_paletted_texture, + IRR_OES_fixed_point, + IRR_OES_query_matrix, IRR_OES_read_format, + IRR_OES_single_precision, IRR_OML_interlace, IRR_OML_resample, IRR_OML_subsample, @@ -848,6 +936,7 @@ class COpenGLExtensionHandler IRR_SGI_color_matrix, IRR_SGI_color_table, IRR_SGI_depth_pass_instrument, + IRR_SGI_texture_color_table, IRR_SGIS_detail_texture, IRR_SGIS_fog_function, IRR_SGIS_generate_mipmap, @@ -863,7 +952,6 @@ class COpenGLExtensionHandler IRR_SGIS_texture_filter4, IRR_SGIS_texture_lod, IRR_SGIS_texture_select, - IRR_SGI_texture_color_table, IRR_SGIX_async, IRR_SGIX_async_histogram, IRR_SGIX_async_pixel, @@ -879,7 +967,6 @@ class COpenGLExtensionHandler IRR_SGIX_fragment_lighting, IRR_SGIX_framezoom, IRR_SGIX_igloo_interface, - IRR_SGIX_impact_pixel_texture, IRR_SGIX_instruments, IRR_SGIX_interlace, IRR_SGIX_ir_instrument1, diff --git a/source/Irrlicht/glxext.h b/source/Irrlicht/glxext.h index 07b0219c..aea26b2f 100644 --- a/source/Irrlicht/glxext.h +++ b/source/Irrlicht/glxext.h @@ -6,7 +6,7 @@ extern "C" { #endif /* -** Copyright (c) 2007-2011 The Khronos Group Inc. +** Copyright (c) 2007-2012 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -48,9 +48,9 @@ extern "C" { /*************************************************************/ /* Header file version number, required by OpenGL ABI for Linux */ -/* glxext.h last updated 2010/08/06 */ +/* glxext.h last updated 2013/01/02 */ /* Current version at http://www.opengl.org/registry/ */ -#define GLX_GLXEXT_VERSION 32 +#define GLX_GLXEXT_VERSION 34 #ifndef GLX_VERSION_1_3 #define GLX_WINDOW_BIT 0x00000001 @@ -440,6 +440,18 @@ extern "C" { #define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 #endif +#ifndef GLX_EXT_create_context_es_profile +#define GLX_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004 +#endif + +#ifndef GLX_EXT_swap_control_tear +#define GLX_LATE_SWAPS_TEAR_EXT 0x20F3 +#endif + +#ifndef GLX_EXT_buffer_age +#define GLX_BACK_BUFFER_AGE_EXT 0x20F4 +#endif + /*************************************************************/ @@ -964,9 +976,9 @@ typedef void ( * PFNGLXRELEASEVIDEOCAPTUREDEVICENVPROC) (Display *dpy, GLXVideoC #ifndef GLX_EXT_swap_control #define GLX_EXT_swap_control 1 #ifdef GLX_GLXEXT_PROTOTYPES -extern int glXSwapIntervalEXT (Display *dpy, GLXDrawable drawable, int interval); +extern void glXSwapIntervalEXT (Display *dpy, GLXDrawable drawable, int interval); #endif /* GLX_GLXEXT_PROTOTYPES */ -typedef int ( * PFNGLXSWAPINTERVALEXTPROC) (Display *dpy, GLXDrawable drawable, int interval); +typedef void ( * PFNGLXSWAPINTERVALEXTPROC) (Display *dpy, GLXDrawable drawable, int interval); #endif #ifndef GLX_NV_copy_image @@ -985,6 +997,22 @@ typedef void ( * PFNGLXCOPYIMAGESUBDATANVPROC) (Display *dpy, GLXContext srcCtx, #define GLX_NV_multisample_coverage 1 #endif +#ifndef GLX_EXT_create_context_es2_profile +#define GLX_EXT_create_context_es2_profile 1 +#endif + +#ifndef GLX_EXT_create_context_es_profile +#define GLX_EXT_create_context_es_profile 1 +#endif + +#ifndef GLX_EXT_swap_control_tear +#define GLX_EXT_swap_control_tear 1 +#endif + +#ifndef GLX_EXT_buffer_age +#define GLX_EXT_buffer_age 1 +#endif + #ifdef __cplusplus } diff --git a/source/Irrlicht/wglext.h b/source/Irrlicht/wglext.h index a9ddc525..68f63361 100644 --- a/source/Irrlicht/wglext.h +++ b/source/Irrlicht/wglext.h @@ -6,7 +6,7 @@ extern "C" { #endif /* -** Copyright (c) 2007-2011 The Khronos Group Inc. +** Copyright (c) 2007-2012 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -48,9 +48,9 @@ extern "C" { /*************************************************************/ /* Header file version number */ -/* wglext.h last updated 2011/04/13 */ +/* wglext.h last updated 2012/01/04 */ /* Current version at http://www.opengl.org/registry/ */ -#define WGL_WGLEXT_VERSION 23 +#define WGL_WGLEXT_VERSION 24 #ifndef WGL_ARB_buffer_region #define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001 @@ -422,6 +422,12 @@ extern "C" { #define WGL_ACCESS_WRITE_DISCARD_NV 0x00000002 #endif +#ifndef WGL_NV_DX_interop2 +#endif + +#ifndef WGL_EXT_swap_control_tear +#endif + /*************************************************************/ @@ -921,6 +927,14 @@ typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); #endif +#ifndef WGL_NV_DX_interop2 +#define WGL_NV_DX_interop2 1 +#endif + +#ifndef WGL_EXT_swap_control_tear +#define WGL_EXT_swap_control_tear 1 +#endif + #ifdef __cplusplus }