Zebediah Figura : d3d11: Report D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9206277105bdc3aa25fce967d746ac177d9452eb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9206277105bdc3aa25fce967d...

Author: Zebediah Figura 
Date:   Fri Jan 21 11:52:18 2022 -0600

d3d11: Report D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER.

This fixes a black screen in The Unfinished Swan.

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

---

dlls/d3d10core/tests/d3d10core.c | 2 +-
 dlls/d3d11/device.c              | 1 +
 dlls/d3d11/tests/d3d11.c         | 4 ++--
 dlls/wined3d/directx.c           | 5 ++++-
 dlls/wined3d/utils.c             | 3 ++-
 dlls/wined3d/wined3d_private.h   | 1 +
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index 08566fbcd5f..ea710038e17 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_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER)
+        todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY)
         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 dc2edf71446..cb2969d8cf6 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -3758,6 +3758,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 *
     {
         {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_BUFFER,     WINED3D_BIND_INDEX_BUFFER,    0, D3D11_FORMAT_SUPPORT_IA_INDEX_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 3302e7c3c2b..1e2f04a50ac 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -20645,7 +20645,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE

if (formats[i].fl_required <= feature_level)
         {
-            todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER)
+            todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY)
                 ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n",
                         format, feature_name, feature_level, format_support[format]);
             continue;
@@ -20659,7 +20659,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE
             continue;
         }

-        todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER)
+        todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_DISPLAY)
             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 334a520072d..1b34d2eceaa 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1822,7 +1822,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_VERTEX_BUFFER;
+                    | WINED3D_BIND_VERTEX_BUFFER
+                    | WINED3D_BIND_INDEX_BUFFER;
             gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER;
             break;

@@ -1856,6 +1857,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d,
         format_flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS;
     if (bind_flags & WINED3D_BIND_VERTEX_BUFFER)
         format_flags |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE;
+    if (bind_flags & WINED3D_BIND_INDEX_BUFFER)
+        format_flags |= WINED3DFMT_FLAG_INDEX_BUFFER;

if (usage & WINED3DUSAGE_QUERY_FILTER)
         format_flags |= WINED3DFMT_FLAG_FILTERING;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 69c73487240..e50d42ead92 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -345,8 +345,9 @@ static const struct wined3d_format_base_flags format_base_flags[] =
     {WINED3DFMT_R32G32_SINT,           WINED3DFMT_FLAG_CAST_TO_BLOCK},
     {WINED3DFMT_R32_TYPELESS,          WINED3DFMT_FLAG_CAST_TO_BLOCK},
     {WINED3DFMT_R32_FLOAT,             WINED3DFMT_FLAG_CAST_TO_BLOCK},
-    {WINED3DFMT_R32_UINT,              WINED3DFMT_FLAG_CAST_TO_BLOCK},
+    {WINED3DFMT_R32_UINT,              WINED3DFMT_FLAG_CAST_TO_BLOCK | WINED3DFMT_FLAG_INDEX_BUFFER},
     {WINED3DFMT_R32_SINT,              WINED3DFMT_FLAG_CAST_TO_BLOCK},
+    {WINED3DFMT_R16_UINT,              WINED3DFMT_FLAG_INDEX_BUFFER},
 };

static void rgb888_from_rgb565(WORD rgb565, BYTE *r, BYTE *g, BYTE *b)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 95a3b08f78a..8e45b61c61e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -5955,6 +5955,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN
 #define WINED3DFMT_FLAG_BLIT                        0x02000000
 #define WINED3DFMT_FLAG_MAPPABLE                    0x04000000
 #define WINED3DFMT_FLAG_CAST_TO_BLOCK               0x08000000
+#define WINED3DFMT_FLAG_INDEX_BUFFER                0x10000000

struct wined3d_rational
 {