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

[Zebediah Figura (＠zfigura)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1750

[PATCH 1/5] wined3d: Require depth bias clamp to create a feature level 10.0 device.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

---
 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 d38882ff5ab..e5a9e80decb 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2258,6 +2258,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info
             && info->features2.features.multiViewport
             && info->features2.features.geometryShader
             && info->features2.features.depthClamp
+            && info->features2.features.depthBiasClamp
             && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor
             && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor;
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1750

[PATCH 2/5] wined3d: Disable wide line support.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

---
 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 e5a9e80decb..03f7b4bfb5f 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -299,6 +299,7 @@ static void wined3d_disable_vulkan_features(struct wined3d_physical_device_info
     VkPhysicalDeviceFeatures *features = &info->features2.features;
 
     features->depthBounds = VK_FALSE;
+    features->wideLines = VK_FALSE;
     features->alphaToOne = VK_FALSE;
     features->textureCompressionETC2 = VK_FALSE;
     features->textureCompressionASTC_LDR = VK_FALSE;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1750

[PATCH 3/5] wined3d: Require precise occlusion queries to create a feature level 9.2 device.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

---
 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 03f7b4bfb5f..a7b2ff76e28 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2247,6 +2247,11 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk,
             adapter_vk->a.d3d_info.feature_level, vram_bytes, sysmem_bytes);
 }
 
+static bool feature_level_9_2_supported(const struct wined3d_physical_device_info *info)
+{
+    return info->features2.features.occlusionQueryPrecise;
+}
+
 static bool feature_level_9_3_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model)
 {
     return shader_model >= 3
@@ -2293,6 +2298,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p
     if (shader_model <= 1)
         return WINED3D_FEATURE_LEVEL_8;
 
+    if (!feature_level_9_2_supported(info))
+        return WINED3D_FEATURE_LEVEL_9_1;
+
     if (!feature_level_9_3_supported(info, shader_model))
         return WINED3D_FEATURE_LEVEL_9_2;
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1750

[PATCH 4/5] wined3d: Require pipeline statistics queries to create a feature level 10.0 device.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

---
 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 a7b2ff76e28..12bef2fba51 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2265,6 +2265,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info
             && info->features2.features.geometryShader
             && info->features2.features.depthClamp
             && info->features2.features.depthBiasClamp
+            && info->features2.features.pipelineStatisticsQuery
             && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor
             && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor;
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1750

[PATCH 5/5] wined3d: Require vertex pipeline image stores and atomics to create a feature level 11.1 device.

[Zebediah Figura]

From: Zebediah Figura <zfigura(a)codeweavers.com>

---
 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 12bef2fba51..713aaec9e39 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -2283,6 +2283,11 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info
             && info->features2.features.tessellationShader;
 }
 
+static bool feature_level_11_1_supported(const struct wined3d_physical_device_info *info)
+{
+    return info->features2.features.vertexPipelineStoresAndAtomics;
+}
+
 static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_physical_device_info *info,
         const struct shader_caps *shader_caps)
 {
@@ -2314,6 +2319,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p
     if (!feature_level_11_supported(info, shader_model))
         return WINED3D_FEATURE_LEVEL_10_1;
 
+    if (!feature_level_11_1_supported(info))
+        return WINED3D_FEATURE_LEVEL_11;
+
     return WINED3D_FEATURE_LEVEL_11_1;
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1750

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

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1750