From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/opengl32/make_opengl | 7 ++++++- dlls/opengl32/unix_thunks.c | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 1358f2178fb..9f7ba6b99ce 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -1056,13 +1056,14 @@ my %extension_aliases = "GL_ARB_ES3_1_compatibility" => ["GL_NV_ES3_1_compatibility"], "GL_ARB_texture_compression" => ["GL_VERSION_1_3"], "GL_EXT_blend_equation_separate" => ["GL_ATI_blend_equation_separate"], - "GL_EXT_copy_texture" => ["GL_VERSION_1_2"], "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"], + "glColorSubTableEXT" => ["GL_EXT_paletted_texture"], + "glCopyTexSubImage3DEXT" => ["GL_VERSION_1_2"], "WGL_ARB_robustness_application_isolation" => ["WGL_ARB_robustness_isolation"], "WGL_NV_DX_interop" => ["WGL_NVX_DX_interop"], ); @@ -1933,6 +1934,10 @@ foreach (sort keys %ext_functions) push @exts, $alias; } } + foreach my $alias (@{$extension_aliases{$_}}) + { + push @exts, $alias; + } printf OUT " { \"%s\", \"%s\\0\", offsetof(struct opengl_funcs, p_$_) },\n", $_, join("\\0", sort @exts); } print OUT "};\n"; diff --git a/dlls/opengl32/unix_thunks.c b/dlls/opengl32/unix_thunks.c index 31584ddb1b5..81a3d85bb09 100644 --- a/dlls/opengl32/unix_thunks.c +++ b/dlls/opengl32/unix_thunks.c @@ -92076,7 +92076,7 @@ const struct registry_entry extension_registry[2758] = { "glColorPointerListIBM", "GL_IBM_vertex_array_lists\0", offsetof(struct opengl_funcs, p_glColorPointerListIBM) }, { "glColorPointervINTEL", "GL_INTEL_parallel_arrays\0", offsetof(struct opengl_funcs, p_glColorPointervINTEL) }, { "glColorSubTable", "GL_ARB_imaging\0", offsetof(struct opengl_funcs, p_glColorSubTable) }, - { "glColorSubTableEXT", "GL_EXT_color_subtable\0", offsetof(struct opengl_funcs, p_glColorSubTableEXT) }, + { "glColorSubTableEXT", "GL_EXT_color_subtable\0GL_EXT_paletted_texture\0", offsetof(struct opengl_funcs, p_glColorSubTableEXT) }, { "glColorTable", "GL_ARB_imaging\0", offsetof(struct opengl_funcs, p_glColorTable) }, { "glColorTableEXT", "GL_EXT_paletted_texture\0", offsetof(struct opengl_funcs, p_glColorTableEXT) }, { "glColorTableParameterfv", "GL_ARB_imaging\0", offsetof(struct opengl_funcs, p_glColorTableParameterfv) }, @@ -92157,10 +92157,10 @@ const struct registry_entry extension_registry[2758] = { "glCopyMultiTexSubImage3DEXT", "GL_EXT_direct_state_access\0", offsetof(struct opengl_funcs, p_glCopyMultiTexSubImage3DEXT) }, { "glCopyNamedBufferSubData", "GL_ARB_direct_state_access\0GL_VERSION_4_5\0", offsetof(struct opengl_funcs, p_glCopyNamedBufferSubData) }, { "glCopyPathNV", "GL_NV_path_rendering\0", offsetof(struct opengl_funcs, p_glCopyPathNV) }, - { "glCopyTexImage1DEXT", "GL_EXT_copy_texture\0GL_VERSION_1_2\0", offsetof(struct opengl_funcs, p_glCopyTexImage1DEXT) }, - { "glCopyTexImage2DEXT", "GL_EXT_copy_texture\0GL_VERSION_1_2\0", offsetof(struct opengl_funcs, p_glCopyTexImage2DEXT) }, - { "glCopyTexSubImage1DEXT", "GL_EXT_copy_texture\0GL_VERSION_1_2\0", offsetof(struct opengl_funcs, p_glCopyTexSubImage1DEXT) }, - { "glCopyTexSubImage2DEXT", "GL_EXT_copy_texture\0GL_VERSION_1_2\0", offsetof(struct opengl_funcs, p_glCopyTexSubImage2DEXT) }, + { "glCopyTexImage1DEXT", "GL_EXT_copy_texture\0", offsetof(struct opengl_funcs, p_glCopyTexImage1DEXT) }, + { "glCopyTexImage2DEXT", "GL_EXT_copy_texture\0", offsetof(struct opengl_funcs, p_glCopyTexImage2DEXT) }, + { "glCopyTexSubImage1DEXT", "GL_EXT_copy_texture\0", offsetof(struct opengl_funcs, p_glCopyTexSubImage1DEXT) }, + { "glCopyTexSubImage2DEXT", "GL_EXT_copy_texture\0", offsetof(struct opengl_funcs, p_glCopyTexSubImage2DEXT) }, { "glCopyTexSubImage3D", "GL_VERSION_1_2\0", offsetof(struct opengl_funcs, p_glCopyTexSubImage3D) }, { "glCopyTexSubImage3DEXT", "GL_EXT_copy_texture\0GL_VERSION_1_2\0", offsetof(struct opengl_funcs, p_glCopyTexSubImage3DEXT) }, { "glCopyTextureImage1DEXT", "GL_EXT_direct_state_access\0", offsetof(struct opengl_funcs, p_glCopyTextureImage1DEXT) }, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10582