[PATCH v2 0/3] MR772: vkd3d: Add two more resource description/state validations.

[Conor McCarthy (＠cmccarthy)]

--
  v2: vkd3d: Validate that a resource with initial state RENDER_TARGET is a render target.
      vkd3d: Validate presence of flag ALLOW_RENDER_TARGET or ALLOW_DEPTH_STENCIL for multisampled resources.
      tests/d3d12: Test resource flags for multisampled resources.

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/772

[PATCH v2 1/3] tests/d3d12: Test resource flags for multisampled resources.

[Conor McCarthy]

From: Conor McCarthy

---
 tests/d3d12.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index b8d20a581..ebfe05fb2 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -1601,7 +1601,25 @@ static void test_create_committed_resource(void)
     hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
             D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource);
     ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+    /* The ALLOW_RENDER_TARGET or ALLOW_DEPTH_STENCIL flag is required for multisampled resources. */
+    resource_desc.SampleDesc.Count = 4;
+    resource_desc.Flags = 0;
+    hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+            D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, NULL, &IID_ID3D12Resource, (void **)&resource);
+    todo
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+    if (SUCCEEDED(hr))
+        ID3D12Resource_Release(resource);
+
+    resource_desc.Format = DXGI_FORMAT_D32_FLOAT;
+    resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;
+    hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
+            D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, NULL, &IID_ID3D12Resource, (void **)&resource);
+    ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr);
+    ID3D12Resource_Release(resource);
     resource_desc.SampleDesc.Count = 1;
+    resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;

resource_desc.Format = DXGI_FORMAT_UNKNOWN;
     hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,

[PATCH v2 2/3] vkd3d: Validate presence of flag ALLOW_RENDER_TARGET or ALLOW_DEPTH_STENCIL for multisampled resources.

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d/resource.c | 7 +++++++
 tests/d3d12.c         | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index b83a45d06..60dffe3d1 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -1893,6 +1893,13 @@ HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC1 *desc, struct d3
                 WARN("Invalid sample count 0.\n");
                 return E_INVALIDARG;
             }
+            if (desc->SampleDesc.Count > 1
+                    && !(desc->Flags & (D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET | D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL)))
+            {
+                WARN("Sample count %u invalid without ALLOW_RENDER_TARGET or ALLOW_DEPTH_STENCIL.\n",
+                        desc->SampleDesc.Count);
+                return E_INVALIDARG;
+            }

if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0)))
             {
diff --git a/tests/d3d12.c b/tests/d3d12.c
index ebfe05fb2..a03d1ef40 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -1607,10 +1607,7 @@ static void test_create_committed_resource(void)
     resource_desc.Flags = 0;
     hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc,
             D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, NULL, &IID_ID3D12Resource, (void **)&resource);
-    todo
     ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
-    if (SUCCEEDED(hr))
-        ID3D12Resource_Release(resource);

resource_desc.Format = DXGI_FORMAT_D32_FLOAT;
     resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL;

[PATCH v2 3/3] vkd3d: Validate that a resource with initial state RENDER_TARGET is a render target.

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d/resource.c | 5 +++++
 tests/d3d12.c         | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 60dffe3d1..179999148 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -2003,6 +2003,11 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12
         WARN("Invalid initial resource state %#x.\n", initial_state);
         return E_INVALIDARG;
     }
+    if (initial_state == D3D12_RESOURCE_STATE_RENDER_TARGET && !(desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET))
+    {
+        WARN("Invalid initial resource state %#x for non-render-target.\n", initial_state);
+        return E_INVALIDARG;
+    }

if (optimized_clear_value && d3d12_resource_is_buffer(resource))
     {
diff --git a/tests/d3d12.c b/tests/d3d12.c
index a03d1ef40..60cbafff6 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -1634,9 +1634,7 @@ static void test_create_committed_resource(void)
     hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE,
             &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL,
             &IID_ID3D12Resource, (void **)&resource);
-    todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
-    if (SUCCEEDED(hr))
-        ID3D12Resource_Release(resource);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);

/* A texture cannot be created on a UPLOAD heap. */
     heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD;

[PATCH v2 0/3] MR772: vkd3d: Add two more resource description/state validations. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.