[PATCH 5/6] wined3d: Map GL_EXT_texture_swizzle to GL_ARB_texture_swizzle.

[Józef Kucia]

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
---
 dlls/wined3d/adapter_gl.c | 5 +++++
 dlls/wined3d/wined3d_gl.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 3157c49a59ae..ff7d345f32fb 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -204,6 +204,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
     {"GL_EXT_texture_snorm",                EXT_TEXTURE_SNORM             },
     {"GL_EXT_texture_sRGB",                 EXT_TEXTURE_SRGB              },
     {"GL_EXT_texture_sRGB_decode",          EXT_TEXTURE_SRGB_DECODE       },
+    {"GL_EXT_texture_swizzle",              EXT_TEXTURE_SWIZZLE           },
     {"GL_EXT_vertex_array_bgra",            EXT_VERTEX_ARRAY_BGRA         },
 
     /* NV */
@@ -3645,6 +3646,10 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
         TRACE("Disabling ARB_clip_control because ARB_viewport_array is not supported.\n");
         gl_info->supported[ARB_CLIP_CONTROL] = FALSE;
     }
+    if (!gl_info->supported[ARB_TEXTURE_SWIZZLE] && gl_info->supported[EXT_TEXTURE_SWIZZLE])
+    {
+        gl_info->supported[ARB_TEXTURE_SWIZZLE] = TRUE;
+    }
     if (gl_info->supported[ARB_STENCIL_TEXTURING] && !gl_info->supported[ARB_TEXTURE_SWIZZLE])
     {
         /* The stencil value needs to be placed in the green channel.  */
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index ae067e65805a..102ab06988a1 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -186,6 +186,7 @@ enum wined3d_gl_extension
     EXT_TEXTURE_SNORM,
     EXT_TEXTURE_SRGB,
     EXT_TEXTURE_SRGB_DECODE,
+    EXT_TEXTURE_SWIZZLE,
     EXT_VERTEX_ARRAY_BGRA,
     /* NVIDIA */
     NV_FENCE,
-- 
2.19.2

[Henri Verbeet]

On Fri, 5 Apr 2019 at 13:23, Józef Kucia <jkucia(a)codeweavers.com> wrote:
> dlls/wined3d/adapter_gl.c | 5 +++++
>  dlls/wined3d/wined3d_gl.h | 1 +
>  2 files changed, 6 insertions(+)

For straightforward renames like this, we typically just handle things
in gl_extension_map[]. (See e.g. GL_EXT_polygon_offset_clamp).