[PATCH 1/2] d3d11: Report D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 dlls/d3d11/device.c      | 5 +++++
 dlls/d3d11/tests/d3d11.c | 9 +++++++--
 dlls/wined3d/directx.c   | 6 +++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 8f70d823247..098dbd449b7 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -3747,6 +3747,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},
@@ -3794,7 +3795,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 *
     wined3d_mutex_unlock();
 
     if (feature_level < D3D_FEATURE_LEVEL_10_0)
+    {
         *format_support &= ~D3D11_FORMAT_SUPPORT_BUFFER;
+        if (format == DXGI_FORMAT_R8G8_UINT || format == DXGI_FORMAT_R16_FLOAT)
+            *format_support &= ~D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER;
+    }
 
     if (*format_support & (D3D11_FORMAT_SUPPORT_TEXTURE1D
             | D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D))
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index f59e9e99f1f..a9373b6c624 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -20699,8 +20699,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;
         }
 
@@ -34163,6 +34164,10 @@ START_TEST(d3d11)
 
     print_adapter_info();
 
+    queue_for_each_feature_level(test_format_support);
+    run_queued_tests();
+    return;
+
     queue_test(test_create_device);
     queue_for_each_feature_level(test_device_interfaces);
     queue_test(test_immediate_context);
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)
-- 
2.34.1