From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/opengl32/make_opengl | 11 +++++++++++ dlls/opengl32/unix_thunks.c | 16 ++++++++-------- include/wine/wgl.h | 10 ++++++++++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 3ae37e2eed1..9aae3ed184a 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -1038,7 +1038,18 @@ my %unexposed_extensions = ); my %extension_aliases = ( + "GL_AMD_debug_output" => ["GL_AMDX_debug_output"], + "GL_ARB_copy_buffer" => ["GL_EXT_copy_buffer"], + "GL_ARB_ES3_1_compatibility" => ["GL_NV_ES3_1_compatibility"], "GL_EXT_blend_equation_separate" => ["GL_ATI_blend_equation_separate"], + "GL_EXT_texture_cube_map_array" => ["GL_AMD_texture_cube_map_array"], + "GL_EXT_texture_snorm" => ["GL_ARB_texture_snorm"], + "GL_NV_gpu_program5" => ["GL_NV_gpu_program_fp64"], + "GL_NV_packed_float" => ["GL_NV_packed_float_linear"], + "GL_NV_texgen_reflection" => ["GL_EXT_texgen_reflection"], + "GL_SGIS_texture_lod" => ["GL_EXT_texture_lod"], + "WGL_ARB_robustness_application_isolation" => ["WGL_ARB_robustness_isolation"], + "WGL_NV_DX_interop" => ["WGL_NVX_DX_interop"], ); my %command_aliases = (); diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 604d86e568a..599822b5bc8 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -92112,7 +92112,7 @@ const struct registry_entry extension_registry[2758] = { "glConvolutionParameterivEXT", "GL_EXT_convolution\0", offsetof(struct opengl_funcs, p_glConvolutionParameterivEXT) }, { "glConvolutionParameterxOES", "GL_OES_fixed_point\0", offsetof(struct opengl_funcs, p_glConvolutionParameterxOES) }, { "glConvolutionParameterxvOES", "GL_OES_fixed_point\0", offsetof(struct opengl_funcs, p_glConvolutionParameterxvOES) }, - { "glCopyBufferSubData", "GL_ARB_copy_buffer\0GL_VERSION_3_1\0", offsetof(struct opengl_funcs, p_glCopyBufferSubData) }, + { "glCopyBufferSubData", "GL_ARB_copy_buffer\0GL_EXT_copy_buffer\0GL_VERSION_3_1\0", offsetof(struct opengl_funcs, p_glCopyBufferSubData) }, { "glCopyColorSubTable", "GL_ARB_imaging\0", offsetof(struct opengl_funcs, p_glCopyColorSubTable) }, { "glCopyColorSubTableEXT", "GL_EXT_color_subtable\0", offsetof(struct opengl_funcs, p_glCopyColorSubTableEXT) }, { "glCopyColorTable", "GL_ARB_imaging\0", offsetof(struct opengl_funcs, p_glCopyColorTable) }, @@ -92176,13 +92176,13 @@ const struct registry_entry extension_registry[2758] = { "glCullParameterfvEXT", "GL_EXT_cull_vertex\0", offsetof(struct opengl_funcs, p_glCullParameterfvEXT) }, { "glCurrentPaletteMatrixARB", "GL_ARB_matrix_palette\0", offsetof(struct opengl_funcs, p_glCurrentPaletteMatrixARB) }, { "glDebugMessageCallback", "GL_KHR_debug\0GL_VERSION_4_3\0", offsetof(struct opengl_funcs, p_glDebugMessageCallback) }, - { "glDebugMessageCallbackAMD", "GL_AMD_debug_output\0", offsetof(struct opengl_funcs, p_glDebugMessageCallbackAMD) }, + { "glDebugMessageCallbackAMD", "GL_AMDX_debug_output\0GL_AMD_debug_output\0", offsetof(struct opengl_funcs, p_glDebugMessageCallbackAMD) }, { "glDebugMessageCallbackARB", "GL_ARB_debug_output\0", offsetof(struct opengl_funcs, p_glDebugMessageCallbackARB) }, { "glDebugMessageControl", "GL_KHR_debug\0GL_VERSION_4_3\0", offsetof(struct opengl_funcs, p_glDebugMessageControl) }, { "glDebugMessageControlARB", "GL_ARB_debug_output\0", offsetof(struct opengl_funcs, p_glDebugMessageControlARB) }, - { "glDebugMessageEnableAMD", "GL_AMD_debug_output\0", offsetof(struct opengl_funcs, p_glDebugMessageEnableAMD) }, + { "glDebugMessageEnableAMD", "GL_AMDX_debug_output\0GL_AMD_debug_output\0", offsetof(struct opengl_funcs, p_glDebugMessageEnableAMD) }, { "glDebugMessageInsert", "GL_KHR_debug\0GL_VERSION_4_3\0", offsetof(struct opengl_funcs, p_glDebugMessageInsert) }, - { "glDebugMessageInsertAMD", "GL_AMD_debug_output\0", offsetof(struct opengl_funcs, p_glDebugMessageInsertAMD) }, + { "glDebugMessageInsertAMD", "GL_AMDX_debug_output\0GL_AMD_debug_output\0", offsetof(struct opengl_funcs, p_glDebugMessageInsertAMD) }, { "glDebugMessageInsertARB", "GL_ARB_debug_output\0", offsetof(struct opengl_funcs, p_glDebugMessageInsertARB) }, { "glDeformSGIX", "GL_SGIX_polynomial_ffd\0", offsetof(struct opengl_funcs, p_glDeformSGIX) }, { "glDeformationMap3dSGIX", "GL_SGIX_polynomial_ffd\0", offsetof(struct opengl_funcs, p_glDeformationMap3dSGIX) }, @@ -92517,7 +92517,7 @@ const struct registry_entry extension_registry[2758] = { "glGetConvolutionParameterxvOES", "GL_OES_fixed_point\0", offsetof(struct opengl_funcs, p_glGetConvolutionParameterxvOES) }, { "glGetCoverageModulationTableNV", "GL_NV_framebuffer_mixed_samples\0", offsetof(struct opengl_funcs, p_glGetCoverageModulationTableNV) }, { "glGetDebugMessageLog", "GL_KHR_debug\0GL_VERSION_4_3\0", offsetof(struct opengl_funcs, p_glGetDebugMessageLog) }, - { "glGetDebugMessageLogAMD", "GL_AMD_debug_output\0", offsetof(struct opengl_funcs, p_glGetDebugMessageLogAMD) }, + { "glGetDebugMessageLogAMD", "GL_AMDX_debug_output\0GL_AMD_debug_output\0", offsetof(struct opengl_funcs, p_glGetDebugMessageLogAMD) }, { "glGetDebugMessageLogARB", "GL_ARB_debug_output\0", offsetof(struct opengl_funcs, p_glGetDebugMessageLogARB) }, { "glGetDetailTexFuncSGIS", "GL_SGIS_detail_texture\0", offsetof(struct opengl_funcs, p_glGetDetailTexFuncSGIS) }, { "glGetDoubleIndexedvEXT", "GL_EXT_direct_state_access\0", offsetof(struct opengl_funcs, p_glGetDoubleIndexedvEXT) }, @@ -92703,7 +92703,7 @@ const struct registry_entry extension_registry[2758] = { "glGetProgramStageiv", "GL_ARB_shader_subroutine\0GL_VERSION_4_0\0", offsetof(struct opengl_funcs, p_glGetProgramStageiv) }, { "glGetProgramStringARB", "GL_ARB_fragment_program\0GL_ARB_vertex_program\0", offsetof(struct opengl_funcs, p_glGetProgramStringARB) }, { "glGetProgramStringNV", "GL_NV_vertex_program\0", offsetof(struct opengl_funcs, p_glGetProgramStringNV) }, - { "glGetProgramSubroutineParameteruivNV", "GL_NV_gpu_program5\0", offsetof(struct opengl_funcs, p_glGetProgramSubroutineParameteruivNV) }, + { "glGetProgramSubroutineParameteruivNV", "GL_NV_gpu_program5\0GL_NV_gpu_program_fp64\0", offsetof(struct opengl_funcs, p_glGetProgramSubroutineParameteruivNV) }, { "glGetProgramiv", "GL_VERSION_2_0\0", offsetof(struct opengl_funcs, p_glGetProgramiv) }, { "glGetProgramivARB", "GL_ARB_fragment_program\0GL_ARB_vertex_program\0", offsetof(struct opengl_funcs, p_glGetProgramivARB) }, { "glGetProgramivNV", "GL_NV_vertex_program\0", offsetof(struct opengl_funcs, p_glGetProgramivNV) }, @@ -93075,7 +93075,7 @@ const struct registry_entry extension_registry[2758] = { "glMaxShaderCompilerThreadsARB", "GL_ARB_parallel_shader_compile\0", offsetof(struct opengl_funcs, p_glMaxShaderCompilerThreadsARB) }, { "glMaxShaderCompilerThreadsKHR", "GL_KHR_parallel_shader_compile\0", offsetof(struct opengl_funcs, p_glMaxShaderCompilerThreadsKHR) }, { "glMemoryBarrier", "GL_ARB_shader_image_load_store\0GL_VERSION_4_2\0", offsetof(struct opengl_funcs, p_glMemoryBarrier) }, - { "glMemoryBarrierByRegion", "GL_ARB_ES3_1_compatibility\0GL_VERSION_4_5\0", offsetof(struct opengl_funcs, p_glMemoryBarrierByRegion) }, + { "glMemoryBarrierByRegion", "GL_ARB_ES3_1_compatibility\0GL_NV_ES3_1_compatibility\0GL_VERSION_4_5\0", offsetof(struct opengl_funcs, p_glMemoryBarrierByRegion) }, { "glMemoryBarrierEXT", "GL_EXT_shader_image_load_store\0", offsetof(struct opengl_funcs, p_glMemoryBarrierEXT) }, { "glMemoryObjectParameterivEXT", "GL_EXT_memory_object\0", offsetof(struct opengl_funcs, p_glMemoryObjectParameterivEXT) }, { "glMinSampleShading", "GL_VERSION_4_0\0", offsetof(struct opengl_funcs, p_glMinSampleShading) }, @@ -93487,7 +93487,7 @@ const struct registry_entry extension_registry[2758] = { "glProgramParameters4fvNV", "GL_NV_vertex_program\0", offsetof(struct opengl_funcs, p_glProgramParameters4fvNV) }, { "glProgramPathFragmentInputGenNV", "GL_NV_path_rendering\0", offsetof(struct opengl_funcs, p_glProgramPathFragmentInputGenNV) }, { "glProgramStringARB", "GL_ARB_fragment_program\0GL_ARB_vertex_program\0", offsetof(struct opengl_funcs, p_glProgramStringARB) }, - { "glProgramSubroutineParametersuivNV", "GL_NV_gpu_program5\0", offsetof(struct opengl_funcs, p_glProgramSubroutineParametersuivNV) }, + { "glProgramSubroutineParametersuivNV", "GL_NV_gpu_program5\0GL_NV_gpu_program_fp64\0", offsetof(struct opengl_funcs, p_glProgramSubroutineParametersuivNV) }, { "glProgramUniform1d", "GL_ARB_separate_shader_objects\0GL_VERSION_4_1\0", offsetof(struct opengl_funcs, p_glProgramUniform1d) }, { "glProgramUniform1dEXT", "GL_EXT_direct_state_access\0", offsetof(struct opengl_funcs, p_glProgramUniform1dEXT) }, { "glProgramUniform1dv", "GL_ARB_separate_shader_objects\0GL_VERSION_4_1\0", offsetof(struct opengl_funcs, p_glProgramUniform1dv) }, diff --git a/include/wine/wgl.h b/include/wine/wgl.h index 200bda7ab94..e6d2849f5ce 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -9869,6 +9869,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(WGL_ARB_pixel_format_float) \ USE_GL_EXT(WGL_ARB_render_texture) \ USE_GL_EXT(WGL_ARB_robustness_application_isolation) \ + USE_GL_EXT(WGL_ARB_robustness_isolation) \ USE_GL_EXT(WGL_ARB_robustness_share_group_isolation) \ USE_GL_EXT(WGL_ATI_pixel_format_float) \ USE_GL_EXT(WGL_ATI_render_texture_rectangle) \ @@ -10233,6 +10234,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_3DFX_multisample) \ USE_GL_EXT(GL_3DFX_tbuffer) \ USE_GL_EXT(GL_3DFX_texture_compression_FXT1) \ + USE_GL_EXT(GL_AMDX_debug_output) \ USE_GL_EXT(GL_AMD_blend_minmax_factor) \ USE_GL_EXT(GL_AMD_compressed_3DC_texture) \ USE_GL_EXT(GL_AMD_compressed_ATC_texture) \ @@ -10267,6 +10269,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_AMD_shader_trinary_minmax) \ USE_GL_EXT(GL_AMD_sparse_texture) \ USE_GL_EXT(GL_AMD_stencil_operation_extended) \ + USE_GL_EXT(GL_AMD_texture_cube_map_array) \ USE_GL_EXT(GL_AMD_texture_gather_bias_lod) \ USE_GL_EXT(GL_AMD_texture_texture4) \ USE_GL_EXT(GL_AMD_transform_feedback3_lines_triangles) \ @@ -10444,6 +10447,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_ARB_texture_rectangle) \ USE_GL_EXT(GL_ARB_texture_rg) \ USE_GL_EXT(GL_ARB_texture_rgb10_a2ui) \ + USE_GL_EXT(GL_ARB_texture_snorm) \ USE_GL_EXT(GL_ARB_texture_stencil8) \ USE_GL_EXT(GL_ARB_texture_storage) \ USE_GL_EXT(GL_ARB_texture_storage_multisample) \ @@ -10512,6 +10516,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_EXT_conservative_depth) \ USE_GL_EXT(GL_EXT_convolution) \ USE_GL_EXT(GL_EXT_coordinate_frame) \ + USE_GL_EXT(GL_EXT_copy_buffer) \ USE_GL_EXT(GL_EXT_copy_texture) \ USE_GL_EXT(GL_EXT_cull_vertex) \ USE_GL_EXT(GL_EXT_debug_label) \ @@ -10611,6 +10616,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_EXT_subtexture) \ USE_GL_EXT(GL_EXT_swap_control) \ USE_GL_EXT(GL_EXT_tessellation_point_size) \ + USE_GL_EXT(GL_EXT_texgen_reflection) \ USE_GL_EXT(GL_EXT_texture) \ USE_GL_EXT(GL_EXT_texture3D) \ USE_GL_EXT(GL_EXT_texture_array) \ @@ -10634,6 +10640,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_EXT_texture_format_BGRA8888) \ USE_GL_EXT(GL_EXT_texture_format_sRGB_override) \ USE_GL_EXT(GL_EXT_texture_integer) \ + USE_GL_EXT(GL_EXT_texture_lod) \ USE_GL_EXT(GL_EXT_texture_lod_bias) \ USE_GL_EXT(GL_EXT_texture_mirror_clamp) \ USE_GL_EXT(GL_EXT_texture_mirror_clamp_to_edge) \ @@ -10729,6 +10736,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_NV_3dvision_settings) \ USE_GL_EXT(GL_NV_EGL_stream_consumer_external) \ USE_GL_EXT(GL_NV_ES1_1_compatibility) \ + USE_GL_EXT(GL_NV_ES3_1_compatibility) \ USE_GL_EXT(GL_NV_alpha_to_coverage_dither_control) \ USE_GL_EXT(GL_NV_bgr) \ USE_GL_EXT(GL_NV_bindless_multi_draw_indirect) \ @@ -10781,6 +10789,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_NV_gpu_program4) \ USE_GL_EXT(GL_NV_gpu_program5) \ USE_GL_EXT(GL_NV_gpu_program5_mem_extended) \ + USE_GL_EXT(GL_NV_gpu_program_fp64) \ USE_GL_EXT(GL_NV_gpu_shader5) \ USE_GL_EXT(GL_NV_half_float) \ USE_GL_EXT(GL_NV_image_formats) \ @@ -10795,6 +10804,7 @@ typedef BOOL (GLAPIENTRY *PFN_wglSwapIntervalEXT)( int interval ); USE_GL_EXT(GL_NV_pack_subimage) \ USE_GL_EXT(GL_NV_packed_depth_stencil) \ USE_GL_EXT(GL_NV_packed_float) \ + USE_GL_EXT(GL_NV_packed_float_linear) \ USE_GL_EXT(GL_NV_parameter_buffer_object) \ USE_GL_EXT(GL_NV_parameter_buffer_object2) \ USE_GL_EXT(GL_NV_path_rendering) \ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9987