wined3d: Introduce WINED3DFMT_FLAG_VERTEX_ATTRIBUTE.

To indicate a format can be used for vertex attributes. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Introduce WINED3DFMT_FLAG_VERTEX_ATTRIBUTE.
a220669f · Henri Verbeet · Alexandre Julliard · e3fe1b09 · a220669f · a220669f
Commit a220669f authored Sep 14, 2018 by Henri Verbeet Committed by Alexandre Julliard Sep 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

utils.c dlls/wined3d/utils.c +1 -0

vertexdeclaration.c dlls/wined3d/vertexdeclaration.c +1 -1

wined3d_private.h dlls/wined3d/wined3d_private.h +1 -0

No files found.
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -3692,6 +3692,7 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter,
        format->emit_idx = format_vertex_info[i].emit_idx;
        format->gl_vtx_type = format_vertex_info[i].gl_vtx_type;
        format->gl_vtx_format = format->component_count;
+        format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE;
    }

    if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA])

--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -220,7 +220,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara
        if (e->input_slot >= MAX_STREAMS)
            continue;

-        if (!e->format->gl_vtx_format)
+        if (!(e->format->flags[WINED3D_GL_RES_TYPE_BUFFER] & WINED3DFMT_FLAG_VERTEX_ATTRIBUTE))
        {
            FIXME("The application tries to use an unsupported format (%s), returning E_FAIL.\n",
                    debug_d3dformat(elements[i].format));

--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4293,6 +4293,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN
 #define WINED3DFMT_FLAG_INTEGER                     0x00200000
 #define WINED3DFMT_FLAG_GEN_MIPMAP                  0x00400000
 #define WINED3DFMT_FLAG_NORMALISED                  0x00800000
+#define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE            0x01000000

 struct wined3d_rational
 {