diff --git a/doc/glew.html b/doc/glew.html index cc74afd..0f7af26 100644 --- a/doc/glew.html +++ b/doc/glew.html @@ -393,289 +393,271 @@ THE POSSIBILITY OF SUCH DAMAGE. 288 EXT_pixel_transform_color_table 289 EXT_point_parameters 290 EXT_polygon_offset -291 EXT_polygon_offset_clamp -292 EXT_post_depth_coverage -293 EXT_provoking_vertex -294 EXT_raster_multisample -295 EXT_rescale_normal -296 EXT_scene_marker -297 EXT_secondary_color -298 EXT_separate_shader_objects -299 EXT_separate_specular_color -300 EXT_shader_image_load_formatted -301 EXT_shader_image_load_store -302 EXT_shader_integer_mix -303 EXT_shadow_funcs -304 EXT_shared_texture_palette -305 EXT_sparse_texture2 -306 EXT_stencil_clear_tag -307 EXT_stencil_two_side -308 EXT_stencil_wrap -309 EXT_subtexture -310 EXT_texture -311 EXT_texture3D -312 EXT_texture_array -313 EXT_texture_buffer_object -314 EXT_texture_compression_dxt1 -315 EXT_texture_compression_latc -316 EXT_texture_compression_rgtc -317 EXT_texture_compression_s3tc -318 EXT_texture_cube_map -319 EXT_texture_edge_clamp -320 EXT_texture_env -321 EXT_texture_env_add -322 EXT_texture_env_combine -323 EXT_texture_env_dot3 -324 EXT_texture_filter_anisotropic -325 EXT_texture_filter_minmax -326 EXT_texture_integer -327 EXT_texture_lod_bias -328 EXT_texture_mirror_clamp -329 EXT_texture_object -330 EXT_texture_perturb_normal -331 EXT_texture_rectangle -332 EXT_texture_sRGB -333 EXT_texture_sRGB_decode -334 EXT_texture_shared_exponent -335 EXT_texture_snorm -336 EXT_texture_swizzle -337 EXT_timer_query -338 EXT_transform_feedback -339 EXT_vertex_array -340 EXT_vertex_array_bgra -341 EXT_vertex_attrib_64bit -342 EXT_vertex_shader -343 EXT_vertex_weighting -344 EXT_x11_sync_object +291 EXT_provoking_vertex +292 EXT_rescale_normal +293 EXT_scene_marker +294 EXT_secondary_color +295 EXT_separate_shader_objects +296 EXT_separate_specular_color +297 EXT_shader_image_load_formatted +298 EXT_shader_image_load_store +299 EXT_shader_integer_mix +300 EXT_shadow_funcs +301 EXT_shared_texture_palette +302 EXT_stencil_clear_tag +303 EXT_stencil_two_side +304 EXT_stencil_wrap +305 EXT_subtexture +306 EXT_texture +307 EXT_texture3D +308 EXT_texture_array +309 EXT_texture_buffer_object +310 EXT_texture_compression_dxt1 +311 EXT_texture_compression_latc +312 EXT_texture_compression_rgtc +313 EXT_texture_compression_s3tc +314 EXT_texture_cube_map +315 EXT_texture_edge_clamp +316 EXT_texture_env +317 EXT_texture_env_add +318 EXT_texture_env_combine +319 EXT_texture_env_dot3 +320 EXT_texture_filter_anisotropic +321 EXT_texture_integer +322 EXT_texture_lod_bias +323 EXT_texture_mirror_clamp +324 EXT_texture_object +325 EXT_texture_perturb_normal +326 EXT_texture_rectangle +327 EXT_texture_sRGB +328 EXT_texture_sRGB_decode +329 EXT_texture_shared_exponent +330 EXT_texture_snorm +331 EXT_texture_swizzle +332 EXT_timer_query +333 EXT_transform_feedback +334 EXT_vertex_array +335 EXT_vertex_array_bgra +336 EXT_vertex_attrib_64bit +337 EXT_vertex_shader +338 EXT_vertex_weighting +339 EXT_x11_sync_object
-345 GREMEDY_frame_terminator -346 GREMEDY_string_marker +340 GREMEDY_frame_terminator +341 GREMEDY_string_marker
-347 HP_convolution_border_modes -348 HP_image_transform -349 HP_occlusion_test -350 HP_texture_lighting +342 HP_convolution_border_modes +343 HP_image_transform +344 HP_occlusion_test +345 HP_texture_lighting
-351 IBM_cull_vertex -352 IBM_multimode_draw_arrays -353 IBM_rasterpos_clip -354 IBM_static_data -355 IBM_texture_mirrored_repeat -356 IBM_vertex_array_lists +346 IBM_cull_vertex +347 IBM_multimode_draw_arrays +348 IBM_rasterpos_clip +349 IBM_static_data +350 IBM_texture_mirrored_repeat +351 IBM_vertex_array_lists
-357 INGR_color_clamp -358 INGR_interlace_read +352 INGR_color_clamp +353 INGR_interlace_read
-359 INTEL_fragment_shader_ordering -360 INTEL_map_texture -361 INTEL_parallel_arrays -362 INTEL_performance_query -363 INTEL_texture_scissor +354 INTEL_fragment_shader_ordering +355 INTEL_map_texture +356 INTEL_parallel_arrays +357 INTEL_performance_query +358 INTEL_texture_scissor
-364 KHR_blend_equation_advanced -365 KHR_blend_equation_advanced_coherent -366 KHR_context_flush_control -367 KHR_debug -368 KHR_robust_buffer_access_behavior -369 KHR_robustness -370 KHR_texture_compression_astc_hdr -371 KHR_texture_compression_astc_ldr +359 KHR_blend_equation_advanced +360 KHR_blend_equation_advanced_coherent +361 KHR_context_flush_control +362 KHR_debug +363 KHR_robust_buffer_access_behavior +364 KHR_robustness +365 KHR_texture_compression_astc_hdr +366 KHR_texture_compression_astc_ldr
-372 KTX_buffer_region +367 KTX_buffer_region
-373 MESAX_texture_stack +368 MESAX_texture_stack
-374 MESA_pack_invert -375 MESA_resize_buffers -376 MESA_window_pos -377 MESA_ycbcr_texture +369 MESA_pack_invert +370 MESA_resize_buffers +371 MESA_window_pos +372 MESA_ycbcr_texture
-378 NVX_conditional_render -379 NVX_gpu_memory_info +373 NVX_conditional_render +374 NVX_gpu_memory_info
-380 NV_bindless_multi_draw_indirect -381 NV_bindless_multi_draw_indirect_count -382 NV_bindless_texture -383 NV_blend_equation_advanced -384 NV_blend_equation_advanced_coherent -385 NV_blend_square -386 NV_compute_program5 -387 NV_conditional_render -388 NV_conservative_raster -389 NV_copy_depth_to_color -390 NV_copy_image -391 NV_deep_texture3D -392 NV_depth_buffer_float -393 NV_depth_clamp -394 NV_depth_range_unclamped -395 NV_draw_texture -396 NV_evaluators -397 NV_explicit_multisample -398 NV_fence -399 NV_fill_rectangle -400 NV_float_buffer -401 NV_fog_distance -402 NV_fragment_coverage_to_color -403 NV_fragment_program -404 NV_fragment_program2 -405 NV_fragment_program4 -406 NV_fragment_program_option -407 NV_fragment_shader_interlock -408 NV_framebuffer_mixed_samples -409 NV_framebuffer_multisample_coverage -410 NV_geometry_program4 -411 NV_geometry_shader4 -412 NV_geometry_shader_passthrough -413 NV_gpu_program4 -414 NV_gpu_program5 -415 NV_gpu_program5_mem_extended -416 NV_gpu_program_fp64 -417 NV_gpu_shader5 -418 NV_half_float -419 NV_internalformat_sample_query -420 NV_light_max_exponent -421 NV_multisample_coverage -422 NV_multisample_filter_hint -423 NV_occlusion_query -424 NV_packed_depth_stencil -425 NV_parameter_buffer_object -426 NV_parameter_buffer_object2 -427 NV_path_rendering -428 NV_path_rendering_shared_edge -429 NV_pixel_data_range -430 NV_point_sprite -431 NV_present_video -432 NV_primitive_restart -433 NV_register_combiners -434 NV_register_combiners2 -435 NV_sample_locations -436 NV_sample_mask_override_coverage -437 NV_shader_atomic_counters -438 NV_shader_atomic_float -439 NV_shader_atomic_fp16_vector -440 NV_shader_atomic_int64 -441 NV_shader_buffer_load -442 NV_shader_storage_buffer_object -443 NV_shader_thread_group -444 NV_shader_thread_shuffle -445 NV_tessellation_program5 -446 NV_texgen_emboss -447 NV_texgen_reflection -448 NV_texture_barrier -449 NV_texture_compression_vtc -450 NV_texture_env_combine4 -451 NV_texture_expand_normal -452 NV_texture_multisample -453 NV_texture_rectangle -454 NV_texture_shader -455 NV_texture_shader2 -456 NV_texture_shader3 -457 NV_transform_feedback -458 NV_transform_feedback2 -459 NV_uniform_buffer_unified_memory -460 NV_vdpau_interop -461 NV_vertex_array_range -462 NV_vertex_array_range2 -463 NV_vertex_attrib_integer_64bit -464 NV_vertex_buffer_unified_memory -465 NV_vertex_program -466 NV_vertex_program1_1 -467 NV_vertex_program2 -468 NV_vertex_program2_option -469 NV_vertex_program3 -470 NV_vertex_program4 -471 NV_video_capture -472 NV_viewport_array2 +375 NV_bindless_multi_draw_indirect +376 NV_bindless_multi_draw_indirect_count +377 NV_bindless_texture +378 NV_blend_equation_advanced +379 NV_blend_equation_advanced_coherent +380 NV_blend_square +381 NV_compute_program5 +382 NV_conditional_render +383 NV_copy_depth_to_color +384 NV_copy_image +385 NV_deep_texture3D +386 NV_depth_buffer_float +387 NV_depth_clamp +388 NV_depth_range_unclamped +389 NV_draw_texture +390 NV_evaluators +391 NV_explicit_multisample +392 NV_fence +393 NV_float_buffer +394 NV_fog_distance +395 NV_fragment_program +396 NV_fragment_program2 +397 NV_fragment_program4 +398 NV_fragment_program_option +399 NV_framebuffer_multisample_coverage +400 NV_geometry_program4 +401 NV_geometry_shader4 +402 NV_gpu_program4 +403 NV_gpu_program5 +404 NV_gpu_program5_mem_extended +405 NV_gpu_program_fp64 +406 NV_gpu_shader5 +407 NV_half_float +408 NV_light_max_exponent +409 NV_multisample_coverage +410 NV_multisample_filter_hint +411 NV_occlusion_query +412 NV_packed_depth_stencil +413 NV_parameter_buffer_object +414 NV_parameter_buffer_object2 +415 NV_path_rendering +416 NV_pixel_data_range +417 NV_point_sprite +418 NV_present_video +419 NV_primitive_restart +420 NV_register_combiners +421 NV_register_combiners2 +422 NV_shader_atomic_counters +423 NV_shader_atomic_float +424 NV_shader_atomic_int64 +425 NV_shader_buffer_load +426 NV_shader_storage_buffer_object +427 NV_shader_thread_group +428 NV_shader_thread_shuffle +429 NV_tessellation_program5 +430 NV_texgen_emboss +431 NV_texgen_reflection +432 NV_texture_barrier +433 NV_texture_compression_vtc +434 NV_texture_env_combine4 +435 NV_texture_expand_normal +436 NV_texture_multisample +437 NV_texture_rectangle +438 NV_texture_shader +439 NV_texture_shader2 +440 NV_texture_shader3 +441 NV_transform_feedback +442 NV_transform_feedback2 +443 NV_vdpau_interop +444 NV_vertex_array_range +445 NV_vertex_array_range2 +446 NV_vertex_attrib_integer_64bit +447 NV_vertex_buffer_unified_memory +448 NV_vertex_program +449 NV_vertex_program1_1 +450 NV_vertex_program2 +451 NV_vertex_program2_option +452 NV_vertex_program3 +453 NV_vertex_program4 +454 NV_video_capture
-473 OES_byte_coordinates -474 OES_compressed_paletted_texture -475 OES_read_format -476 OES_single_precision +455 OES_byte_coordinates +456 OES_compressed_paletted_texture +457 OES_read_format +458 OES_single_precision
-477 OML_interlace -478 OML_resample -479 OML_subsample +459 OML_interlace +460 OML_resample +461 OML_subsample
-480 PGI_misc_hints -481 PGI_vertex_hints +462 PGI_misc_hints +463 PGI_vertex_hints
-482 REGAL_ES1_0_compatibility -483 REGAL_ES1_1_compatibility -484 REGAL_enable -485 REGAL_error_string -486 REGAL_extension_query -487 REGAL_log -488 REGAL_proc_address +464 REGAL_ES1_0_compatibility +465 REGAL_ES1_1_compatibility +466 REGAL_enable +467 REGAL_error_string +468 REGAL_extension_query +469 REGAL_log +470 REGAL_proc_address
-489 REND_screen_coordinates +471 REND_screen_coordinates
-490 S3_s3tc +472 S3_s3tc
-491 SGIS_color_range -492 SGIS_detail_texture -493 SGIS_fog_function -494 SGIS_generate_mipmap -495 SGIS_multisample -496 SGIS_pixel_texture -497 SGIS_point_line_texgen -498 SGIS_sharpen_texture -499 SGIS_texture4D -500 SGIS_texture_border_clamp -501 SGIS_texture_edge_clamp -502 SGIS_texture_filter4 -503 SGIS_texture_lod -504 SGIS_texture_select +473 SGIS_color_range +474 SGIS_detail_texture +475 SGIS_fog_function +476 SGIS_generate_mipmap +477 SGIS_multisample +478 SGIS_pixel_texture +479 SGIS_point_line_texgen +480 SGIS_sharpen_texture +481 SGIS_texture4D +482 SGIS_texture_border_clamp +483 SGIS_texture_edge_clamp +484 SGIS_texture_filter4 +485 SGIS_texture_lod +486 SGIS_texture_select
-505 SGIX_async -506 SGIX_async_histogram -507 SGIX_async_pixel -508 SGIX_blend_alpha_minmax -509 SGIX_clipmap -510 SGIX_convolution_accuracy -511 SGIX_depth_texture -512 SGIX_flush_raster -513 SGIX_fog_offset -514 SGIX_fog_texture -515 SGIX_fragment_specular_lighting -516 SGIX_framezoom -517 SGIX_interlace -518 SGIX_ir_instrument1 -519 SGIX_list_priority -520 SGIX_pixel_texture -521 SGIX_pixel_texture_bits -522 SGIX_reference_plane -523 SGIX_resample -524 SGIX_shadow -525 SGIX_shadow_ambient -526 SGIX_sprite -527 SGIX_tag_sample_buffer -528 SGIX_texture_add_env -529 SGIX_texture_coordinate_clamp -530 SGIX_texture_lod_bias -531 SGIX_texture_multi_buffer -532 SGIX_texture_range -533 SGIX_texture_scale_bias -534 SGIX_vertex_preclip -535 SGIX_vertex_preclip_hint -536 SGIX_ycrcb +487 SGIX_async +488 SGIX_async_histogram +489 SGIX_async_pixel +490 SGIX_blend_alpha_minmax +491 SGIX_clipmap +492 SGIX_convolution_accuracy +493 SGIX_depth_texture +494 SGIX_flush_raster +495 SGIX_fog_offset +496 SGIX_fog_texture +497 SGIX_fragment_specular_lighting +498 SGIX_framezoom +499 SGIX_interlace +500 SGIX_ir_instrument1 +501 SGIX_list_priority +502 SGIX_pixel_texture +503 SGIX_pixel_texture_bits +504 SGIX_reference_plane +505 SGIX_resample +506 SGIX_shadow +507 SGIX_shadow_ambient +508 SGIX_sprite +509 SGIX_tag_sample_buffer +510 SGIX_texture_add_env +511 SGIX_texture_coordinate_clamp +512 SGIX_texture_lod_bias +513 SGIX_texture_multi_buffer +514 SGIX_texture_range +515 SGIX_texture_scale_bias +516 SGIX_vertex_preclip +517 SGIX_vertex_preclip_hint +518 SGIX_ycrcb
-537 SGI_color_matrix -538 SGI_color_table -539 SGI_texture_color_table +519 SGI_color_matrix +520 SGI_color_table +521 SGI_texture_color_table
-540 SUNX_constant_data +522 SUNX_constant_data
-541 SUN_convolution_border_modes -542 SUN_global_alpha -543 SUN_mesh_array -544 SUN_read_video_pixels -545 SUN_slice_accum -546 SUN_triangle_list -547 SUN_vertex +523 SUN_convolution_border_modes +524 SUN_global_alpha +525 SUN_mesh_array +526 SUN_read_video_pixels +527 SUN_slice_accum +528 SUN_triangle_list +529 SUN_vertex
-548 WIN_phong_shading -549 WIN_specular_fog -550 WIN_swap_hint +530 WIN_phong_shading +531 WIN_specular_fog +532 WIN_swap_hint diff --git a/include/GL/glew.h b/include/GL/glew.h index 57d1f2c..d464a3e 100644 --- a/include/GL/glew.h +++ b/include/GL/glew.h @@ -1,6 +1,6 @@ /* ** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2014, Nigel Stewart +** Copyright (C) 2008-2015, Nigel Stewart ** Copyright (C) 2002-2008, Milan Ikits ** Copyright (C) 2002-2008, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev @@ -2438,6 +2438,8 @@ typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGPROC) (GLclampf value); #define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D #define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E #define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F +#define GL_COPY_READ_BUFFER_BINDING 0x8F36 +#define GL_COPY_WRITE_BUFFER_BINDING 0x8F37 #define GLEW_VERSION_4_2 GLEW_GET_VAR(__GLEW_VERSION_4_2) @@ -2473,6 +2475,10 @@ typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGPROC) (GLclampf value); #ifndef GL_VERSION_4_5 #define GL_VERSION_4_5 1 +typedef GLenum (GLAPIENTRY * PFNGLGETGRAPHICSRESETSTATUSPROC) (void); + +#define glGetGraphicsResetStatus GLEW_GET_FUN(__glewGetGraphicsResetStatus) + #define GLEW_VERSION_4_5 GLEW_GET_VAR(__GLEW_VERSION_4_5) #endif /* GL_VERSION_4_5 */ @@ -16135,6 +16141,8 @@ GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIPROC __glewBlendFuncSeparatei; GLEW_FUN_EXPORT PFNGLBLENDFUNCIPROC __glewBlendFunci; GLEW_FUN_EXPORT PFNGLMINSAMPLESHADINGPROC __glewMinSampleShading; +GLEW_FUN_EXPORT PFNGLGETGRAPHICSRESETSTATUSPROC __glewGetGraphicsResetStatus; + GLEW_FUN_EXPORT PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX; GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKAMDPROC __glewDebugMessageCallbackAMD; diff --git a/include/GL/glxew.h b/include/GL/glxew.h index a5950a2..67ba7c9 100644 --- a/include/GL/glxew.h +++ b/include/GL/glxew.h @@ -1,6 +1,6 @@ /* ** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2014, Nigel Stewart +** Copyright (C) 2008-2015, Nigel Stewart ** Copyright (C) 2002-2008, Milan Ikits ** Copyright (C) 2002-2008, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev diff --git a/include/GL/wglew.h b/include/GL/wglew.h index a61b72b..cd8d0fb 100644 --- a/include/GL/wglew.h +++ b/include/GL/wglew.h @@ -1,6 +1,6 @@ /* ** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2014, Nigel Stewart +** Copyright (C) 2008-2015, Nigel Stewart ** Copyright (C) 2002-2008, Milan Ikits ** Copyright (C) 2002-2008, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev diff --git a/src/glew.c b/src/glew.c index 95547f7..1d32251 100644 --- a/src/glew.c +++ b/src/glew.c @@ -1,6 +1,6 @@ /* ** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2014, Nigel Stewart +** Copyright (C) 2008-2015, Nigel Stewart ** Copyright (C) 2002-2008, Milan Ikits ** Copyright (C) 2002-2008, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev @@ -612,6 +612,8 @@ PFNGLBLENDFUNCSEPARATEIPROC __glewBlendFuncSeparatei = NULL; PFNGLBLENDFUNCIPROC __glewBlendFunci = NULL; PFNGLMINSAMPLESHADINGPROC __glewMinSampleShading = NULL; +PFNGLGETGRAPHICSRESETSTATUSPROC __glewGetGraphicsResetStatus = NULL; + PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX = NULL; PFNGLDEBUGMESSAGECALLBACKAMDPROC __glewDebugMessageCallbackAMD = NULL; @@ -3888,6 +3890,15 @@ static GLboolean _glewInit_GL_VERSION_4_0 (GLEW_CONTEXT_ARG_DEF_INIT) #ifdef GL_VERSION_4_5 +static GLboolean _glewInit_GL_VERSION_4_5 (GLEW_CONTEXT_ARG_DEF_INIT) +{ + GLboolean r = GL_FALSE; + + r = ((glGetGraphicsResetStatus = (PFNGLGETGRAPHICSRESETSTATUSPROC)glewGetProcAddress((const GLubyte*)"glGetGraphicsResetStatus")) == NULL) || r; + + return r; +} + #endif /* GL_VERSION_4_5 */ #ifdef GL_3DFX_multisample @@ -10196,6 +10207,7 @@ GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) #ifdef GL_VERSION_4_4 #endif /* GL_VERSION_4_4 */ #ifdef GL_VERSION_4_5 + if (glewExperimental || GLEW_VERSION_4_5) GLEW_VERSION_4_5 = !_glewInit_GL_VERSION_4_5(GLEW_CONTEXT_ARG_VAR_INIT); #endif /* GL_VERSION_4_5 */ #ifdef GL_3DFX_multisample GLEW_3DFX_multisample = _glewSearchExtension("GL_3DFX_multisample", extStart, extEnd); @@ -14298,9 +14310,9 @@ const GLubyte * GLEWAPIENTRY glewGetString (GLenum name) static const GLubyte* _glewString[] = { (const GLubyte*)NULL, - (const GLubyte*)"1.11.0", + (const GLubyte*)"1.12.0", (const GLubyte*)"1", - (const GLubyte*)"11", + (const GLubyte*)"12", (const GLubyte*)"0" }; const size_t max_string = sizeof(_glewString)/sizeof(*_glewString) - 1; diff --git a/src/glewinfo.c b/src/glewinfo.c index 8ed4e67..5ba5dff 100644 --- a/src/glewinfo.c +++ b/src/glewinfo.c @@ -1,6 +1,6 @@ /* ** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2014, Nigel Stewart +** Copyright (C) 2008-2015, Nigel Stewart ** Copyright (C) 2002-2008, Milan Ikits ** Copyright (C) 2002-2008, Marcelo E. Magallon ** Copyright (C) 2002, Lev Povalahev @@ -554,6 +554,8 @@ static void _glewInfo_GL_VERSION_4_4 (void) static void _glewInfo_GL_VERSION_4_5 (void) { glewPrintExt("GL_VERSION_4_5", GLEW_VERSION_4_5, GLEW_VERSION_4_5, GLEW_VERSION_4_5); + + glewInfoFunc("glGetGraphicsResetStatus", glGetGraphicsResetStatus == NULL); } #endif /* GL_VERSION_4_5 */