wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info().
05792f64 · Henri Verbeet · Alexandre Julliard · 49647cb3 · 05792f64
Commit 05792f64 authored Sep 13, 2018 by Henri Verbeet Committed by Alexandre Julliard Sep 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

utils.c dlls/wined3d/utils.c +6 -6

No files found.
--- 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;
 }