Józef Kucia : wined3d: Handle GL_EXT_vertex_array_bgra directly in gl_extension_map.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 61937c310306cb2e3c64a3eb5feb8c3c0ea0505a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=61937c310306cb2e3c64a3eb5...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Sat Apr  6 11:37:32 2019 +0200

wined3d: Handle GL_EXT_vertex_array_bgra directly in gl_extension_map.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wined3d/adapter_gl.c | 7 +------
 dlls/wined3d/wined3d_gl.h | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index 3ffbbaf..c195bf4 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -205,7 +205,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
     {"GL_EXT_texture_sRGB",                 EXT_TEXTURE_SRGB              },
     {"GL_EXT_texture_sRGB_decode",          EXT_TEXTURE_SRGB_DECODE       },
     {"GL_EXT_texture_swizzle",              ARB_TEXTURE_SWIZZLE           },
-    {"GL_EXT_vertex_array_bgra",            EXT_VERTEX_ARRAY_BGRA         },
+    {"GL_EXT_vertex_array_bgra",            ARB_VERTEX_ARRAY_BGRA         },
 
     /* NV */
     {"GL_NV_fence",                         NV_FENCE                      },
@@ -3530,11 +3530,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
         TRACE(" IMPLIED: NVIDIA (NV) Texture Gen Reflection support.\n");
         gl_info->supported[NV_TEXGEN_REFLECTION] = TRUE;
     }
-    if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && gl_info->supported[EXT_VERTEX_ARRAY_BGRA])
-    {
-        TRACE(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n");
-        gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE;
-    }
     if (!gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC])
     {
         TRACE(" IMPLIED: EXT_texture_compression_rgtc support (by ARB_texture_compression_rgtc).\n");
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
index ae067e6..5241b6c 100644
--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -186,7 +186,6 @@ enum wined3d_gl_extension
     EXT_TEXTURE_SNORM,
     EXT_TEXTURE_SRGB,
     EXT_TEXTURE_SRGB_DECODE,
-    EXT_VERTEX_ARRAY_BGRA,
     /* NVIDIA */
     NV_FENCE,
     NV_FOG_DISTANCE,