[PATCH vkd3d 3/8] vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS1.

[Henri Verbeet]

From: Conor McCarthy <conor.mccarthy.444(a)gmail.com>

Signed-off-by: Conor McCarthy <conor.mccarthy.444(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
This supersedes patch 185476.

 include/vkd3d_d3d12.idl    | 10 ++++++++++
 libs/vkd3d/device.c        | 29 +++++++++++++++++++++++++++++
 libs/vkd3d/vkd3d_private.h |  1 +
 3 files changed, 40 insertions(+)

diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl
index 3bfe47b..73a1012 100644
--- a/include/vkd3d_d3d12.idl
+++ b/include/vkd3d_d3d12.idl
@@ -1615,6 +1615,16 @@ typedef struct D3D12_FEATURE_DATA_SHADER_MODEL
     D3D_SHADER_MODEL HighestShaderModel;
 } D3D12_FEATURE_DATA_SHADER_MODEL;
 
+typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS1
+{
+    BOOL WaveOps;
+    UINT WaveLaneCountMin;
+    UINT WaveLaneCountMax;
+    UINT TotalLaneCount;
+    BOOL ExpandedComputeResourceStates;
+    BOOL Int64ShaderOps;
+}  D3D12_FEATURE_DATA_D3D12_OPTIONS1;
+
 typedef enum D3D12_FEATURE
 {
     D3D12_FEATURE_D3D12_OPTIONS = 0,
diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index 757d4ac..9193fc3 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -1336,6 +1336,14 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device,
     device->feature_options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation = FALSE;
     device->feature_options.ResourceHeapTier = D3D12_RESOURCE_HEAP_TIER_2;
 
+    /* Shader Model 6 support. */
+    device->feature_options1.WaveOps = FALSE;
+    device->feature_options1.WaveLaneCountMin = 0;
+    device->feature_options1.WaveLaneCountMax = 0;
+    device->feature_options1.TotalLaneCount = 0;
+    device->feature_options1.ExpandedComputeResourceStates = TRUE;
+    device->feature_options1.Int64ShaderOps = features->shaderInt64;
+
     if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0)
     {
         ERR("Failed to enumerate device extensions, vr %d.\n", vr);
@@ -2668,6 +2676,27 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *
             return S_OK;
         }
 
+        case D3D12_FEATURE_D3D12_OPTIONS1:
+        {
+            D3D12_FEATURE_DATA_D3D12_OPTIONS1 *data = feature_data;
+
+            if (feature_data_size != sizeof(*data))
+            {
+                WARN("Invalid size %u.\n", feature_data_size);
+                return E_INVALIDARG;
+            }
+
+            *data = device->feature_options1;
+
+            TRACE("Wave ops %#x.\n", data->WaveOps);
+            TRACE("Min wave lane count %#x.\n", data->WaveLaneCountMin);
+            TRACE("Max wave lane count %#x.\n", data->WaveLaneCountMax);
+            TRACE("Total lane count %#x.\n", data->TotalLaneCount);
+            TRACE("Expanded compute resource states %#x.\n", data->ExpandedComputeResourceStates);
+            TRACE("Int64 shader ops %#x.\n", data->Int64ShaderOps);
+            return S_OK;
+        }
+
         case D3D12_FEATURE_ROOT_SIGNATURE:
         {
             D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data;
diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h
index 0c031d2..add727f 100644
--- a/libs/vkd3d/vkd3d_private.h
+++ b/libs/vkd3d/vkd3d_private.h
@@ -1131,6 +1131,7 @@ struct d3d12_device
     VkPhysicalDeviceMemoryProperties memory_properties;
 
     D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options;
+    D3D12_FEATURE_DATA_D3D12_OPTIONS1 feature_options1;
 
     struct vkd3d_vulkan_info vk_info;
 
-- 
2.11.0