[PATCH 0/5] MR1716: wined3d: More Vulkan feature checks.

[PATCH 1/5] wined3d: Require tessellation shaders to create a feature level 11.0 device.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/adapter_vk.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 45b29e8dd97..376f162cb8c 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2261,6 +2261,12 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info
             && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor;
 }

+static bool feature_level_11_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model)
+{
+    return shader_model >= 5
+            && info->features2.features.tessellationShader;
+}
+
 static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_physical_device_info *info,
         const struct shader_caps *shader_caps)
 {
@@ -2283,7 +2289,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p
     if (!feature_level_10_supported(info, shader_model))
         return WINED3D_FEATURE_LEVEL_9_3;

-    if (shader_model <= 4)
+    if (!feature_level_11_supported(info, shader_model))
         return WINED3D_FEATURE_LEVEL_10_1;

return WINED3D_FEATURE_LEVEL_11_1;

[PATCH 2/5] wined3d: Require texture cube array support to create a feature level 10.1 device.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/adapter_vk.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 376f162cb8c..d5c21b06a53 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2261,6 +2261,11 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info
             && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor;
 }

+static bool feature_level_10_1_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model)
+{
+    return info->features2.features.imageCubeArray;
+}
+
 static bool feature_level_11_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model)
 {
     return shader_model >= 5
@@ -2289,6 +2294,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p
     if (!feature_level_10_supported(info, shader_model))
         return WINED3D_FEATURE_LEVEL_9_3;

+    if (!feature_level_10_1_supported(info, shader_model))
+        return WINED3D_FEATURE_LEVEL_10;
+
     if (!feature_level_11_supported(info, shader_model))
         return WINED3D_FEATURE_LEVEL_10_1;

[PATCH 3/5] wined3d: Require multiple indirect draw support to create a feature level 11.0 device.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/adapter_vk.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index d5c21b06a53..5a1a183ee0d 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2269,6 +2269,7 @@ static bool feature_level_10_1_supported(const struct wined3d_physical_device_in
 static bool feature_level_11_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model)
 {
     return shader_model >= 5
+            && info->features2.features.multiDrawIndirect
             && info->features2.features.tessellationShader;
 }

[PATCH 4/5] wined3d: Require indirect draw first instance support to create a feature level 11.0 device.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/adapter_vk.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 5a1a183ee0d..da70a1b3183 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2270,6 +2270,7 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info
 {
     return shader_model >= 5
             && info->features2.features.multiDrawIndirect
+            && info->features2.features.drawIndirectFirstInstance
             && info->features2.features.tessellationShader;
 }

[PATCH 5/5] wined3d: Require depth clip control to create a feature level 10.0 device.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/adapter_vk.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index da70a1b3183..d38882ff5ab 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2257,6 +2257,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info
     return shader_model >= 4
             && info->features2.features.multiViewport
             && info->features2.features.geometryShader
+            && info->features2.features.depthClamp
             && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor
             && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor;
 }

[PATCH 5/5] wined3d: Require depth clip control to create a feature level 10.0 device.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=127290

Your paranoid android.

=== debian11 (32 bit report) ===

winhttp:
notification.c:122: Test failed: 943: expected callback to be called from the same thread
notification.c:122: Test failed: 948: expected callback to be called from the same thread
notification.c:122: Test failed: 953: expected callback to be called from the same thread
notification.c:997: Test failed: got 4
notification.c:1006: Test failed: got 0
notification.c:1010: Test failed: unexpected data 0 at 0
notification.c:1017: Test failed: got 0
notification.c:1018: Test failed: got 1002
notification.c:1019: Test failed: got 18
notification.c:1030: Test failed: got 1002
notification.c:122: Test failed: 937: expected callback to be called from the same thread
notification.c:122: Test failed: 943: expected callback to be called from the same thread
notification.c:122: Test failed: 948: expected callback to be called from the same thread
notification.c:122: Test failed: 953: expected callback to be called from the same thread

[PATCH 0/5] MR1716: wined3d: More Vulkan feature checks. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.