From b60bc5299253f8e3bbab7c3e44b0f91a91e8dba3 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 16 Nov 2022 12:41:07 +0100 Subject: [PATCH] zink: remove needless requirements We never required the uniform texel buffer bit for more than bufferFeatures for a bunch of these formats. Similarly, we *don't* need the uniform texel buffer bit for sampled image access. For the image-dimensions, the Mesa frontend doesn't validate the max 1D, 3D or Cube sizes, nor the max texture layers. So we'll expose GL 4.1 without these, even if that's not conformant. Finally, we don't require robustImageAccess2 for OpenGL 4.3 at all. All we need is the robustBufferAccess feature. Fixes: 2ea481b2f0a ("Zink: add Zink profiles file") Part-of: --- .../drivers/zink/VP_ZINK_requirements.json | 55 ------------------- 1 file changed, 55 deletions(-) diff --git a/src/gallium/drivers/zink/VP_ZINK_requirements.json b/src/gallium/drivers/zink/VP_ZINK_requirements.json index 3fedcfb9d7d..51bdb52a43c 100644 --- a/src/gallium/drivers/zink/VP_ZINK_requirements.json +++ b/src/gallium/drivers/zink/VP_ZINK_requirements.json @@ -124,12 +124,6 @@ "formats": { "VK_FORMAT_R32G32B32_SFLOAT": { "VkFormatProperties": { - "linearTilingFeatures": [ - "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" - ], - "optimalTilingFeatures": [ - "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" - ], "bufferFeatures": [ "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" ] @@ -137,12 +131,6 @@ }, "VK_FORMAT_R32G32B32_SINT": { "VkFormatProperties": { - "linearTilingFeatures": [ - "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" - ], - "optimalTilingFeatures": [ - "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" - ], "bufferFeatures": [ "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" ] @@ -150,12 +138,6 @@ }, "VK_FORMAT_R32G32B32_UINT": { "VkFormatProperties": { - "linearTilingFeatures": [ - "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" - ], - "optimalTilingFeatures": [ - "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" - ], "bufferFeatures": [ "VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT" ] @@ -172,11 +154,7 @@ "properties": { "VkPhysicalDeviceProperties": { "limits": { - "maxImageDimension1D": 16384, "maxImageDimension2D": 16384, - "maxImageDimension3D": 2048, - "maxImageDimensionCube": 16384, - "maxImageArrayLayers": 2048, "maxViewports": 16 } } @@ -214,16 +192,10 @@ } }, "gl43_baseline": { - "extensions": { - "VK_EXT_robustness2": 1 - }, "features": { "VkPhysicalDeviceFeatures": { "robustBufferAccess": true, "multiDrawIndirect": true - }, - "VkPhysicalDeviceRobustness2FeaturesEXT": { - "robustImageAccess2": true } }, "formats": { @@ -234,9 +206,6 @@ ], "optimalTilingFeatures": [ "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" - ], - "bufferFeatures": [ - "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" ] } }, @@ -247,9 +216,6 @@ ], "optimalTilingFeatures": [ "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" - ], - "bufferFeatures": [ - "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" ] } }, @@ -260,9 +226,6 @@ ], "optimalTilingFeatures": [ "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" - ], - "bufferFeatures": [ - "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" ] } }, @@ -273,9 +236,6 @@ ], "optimalTilingFeatures": [ "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" - ], - "bufferFeatures": [ - "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" ] } }, @@ -286,9 +246,6 @@ ], "optimalTilingFeatures": [ "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" - ], - "bufferFeatures": [ - "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" ] } }, @@ -299,9 +256,6 @@ ], "optimalTilingFeatures": [ "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" - ], - "bufferFeatures": [ - "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" ] } }, @@ -312,9 +266,6 @@ ], "optimalTilingFeatures": [ "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" - ], - "bufferFeatures": [ - "VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT" ] } } @@ -327,12 +278,6 @@ "formats": { "VK_FORMAT_B10G11R11_UFLOAT_PACK32": { "VkFormatProperties": { - "linearTilingFeatures": [ - "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT" - ], - "optimalTilingFeatures": [ - "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT" - ], "bufferFeatures": [ "VK_FORMAT_FEATURE_VERTEX_BUFFER_BIT" ]