From c011e6061d8e4d056fe138ab6ef58f4e7ac0f1e7 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 2 Jun 2021 07:05:35 -0400
Subject: [PATCH] d3d12: explicitly advertise index buffer format support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11132>
---
 src/gallium/drivers/d3d12/d3d12_screen.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp
index da93178dbaa..1a84615de42 100644
--- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
@@ -541,9 +541,12 @@ d3d12_is_format_supported(struct pipe_screen *pscreen,
           !(fmt_info.Support1 & D3D12_FORMAT_SUPPORT1_IA_VERTEX_BUFFER))
          return false;
 
-      if (bind & PIPE_BIND_INDEX_BUFFER &&
-          !(fmt_info.Support1 & D3D12_FORMAT_SUPPORT1_IA_INDEX_BUFFER))
-         return false;
+      if (bind & PIPE_BIND_INDEX_BUFFER) {
+         if (format != PIPE_FORMAT_R8_UINT &&
+             format != PIPE_FORMAT_R16_UINT &&
+             format != PIPE_FORMAT_R32_UINT)
+            return false;
+      }
 
       if (sample_count > 0)
          return false;