Zebediah Figura : d3d11: Report D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 59636714e71d15e63ec8e2eaf0e0740188c5be49
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=59636714e71d15e63ec8e2eaf...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Fri Jan 21 11:52:17 2022 -0600

d3d11: Report D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER.

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d10core/tests/d3d10core.c |  2 +-
 dlls/d3d11/device.c              |  1 +
 dlls/d3d11/tests/d3d11.c         | 10 ++++++----
 dlls/wined3d/directx.c           |  6 +++++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index ffab5cbfca3..08566fbcd5f 100644
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -13630,7 +13630,7 @@ static void check_format_support(const unsigned int *format_support,
             continue;
         }
 
-        todo_wine
+        todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER)
         ok(supported, "Format %#x - %s supported, format support %#x.\n",
                 format, feature_name, format_support[format]);
     }
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index eb8a7e65ccd..dc2edf71446 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -3757,6 +3757,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 *
     flag_mapping[] =
     {
         {WINED3D_RTYPE_BUFFER,     WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_BUFFER},
+        {WINED3D_RTYPE_BUFFER,     WINED3D_BIND_VERTEX_BUFFER,   0, D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER},
         {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D},
         {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D},
         {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D},
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 0ab38e366d3..3302e7c3c2b 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -20645,8 +20645,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE
 
         if (formats[i].fl_required <= feature_level)
         {
-            todo_wine ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n",
-                    format, feature_name, feature_level, format_support[format]);
+            todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER)
+                ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n",
+                        format, feature_name, feature_level, format_support[format]);
             continue;
         }
 
@@ -20658,8 +20659,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE
             continue;
         }
 
-        ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n",
-                format, feature_name, feature_level, format_support[format]);
+        todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER)
+            ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n",
+                    format, feature_name, feature_level, format_support[format]);
     }
 }
 
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index b2925eb97e9..334a520072d 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1821,7 +1821,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d,
 
             allowed_usage = WINED3DUSAGE_DYNAMIC;
             allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE
-                    | WINED3D_BIND_UNORDERED_ACCESS;
+                    | WINED3D_BIND_UNORDERED_ACCESS
+                    | WINED3D_BIND_VERTEX_BUFFER;
             gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER;
             break;
 
@@ -1853,6 +1854,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d,
         format_flags |= WINED3DFMT_FLAG_DEPTH_STENCIL;
     if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS)
         format_flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS;
+    if (bind_flags & WINED3D_BIND_VERTEX_BUFFER)
+        format_flags |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE;
+
     if (usage & WINED3DUSAGE_QUERY_FILTER)
         format_flags |= WINED3DFMT_FLAG_FILTERING;
     if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING)