Henri Verbeet : wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 05792f647622f02a9407d479c90fb32b03e42b95
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=05792f647622f02a9407d479c...

Author: Henri Verbeet 
Date:   Thu Sep 13 21:04:44 2018 +0430

wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info().

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/utils.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 54b7bce..0c230da 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -3556,12 +3556,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_
         format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8);
     }

-    if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA])
-    {
-        format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM);
-        format->gl_vtx_format = GL_BGRA;
-    }
-
     if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX])
     {
         /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though.
@@ -3690,6 +3684,12 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter,
         format->gl_vtx_format = format->component_count;
     }

+    if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA])
+    {
+        format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM);
+        format->gl_vtx_format = GL_BGRA;
+    }
+
     return TRUE;
 }