zink: update textureCompressionBC requirement

The mesa state-tracker can now emulate all formats indicated by this
feature-flag, so we don't require this for OpenGL 4.2 any more.

It's however a good idea to support for power-usage and performance
reasons, saving on memory bandwidth. So let's move it to the
gl46_optimal block instead.

Fixes: e4ff42684b9 ("mesa/st: enable bptc extension with fallback")
Fixes: 2ea481b2f0a ("Zink: add Zink profiles file")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19779>
(cherry picked from commit 13bccac5a7d930c809927e69ba7305330fb8a9be)

diff --git a/.pick_status.json b/.pick_status.json
index f23b500..f94eb4a 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1732,7 +1732,7 @@
         "description": "zink: update textureCompressionBC requirement",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e4ff42684b95cfbc9c7b088a1f133bd0555b11e1"
     },

diff --git a/docs/drivers/zink.rst b/docs/drivers/zink.rst
index cf5476f..1a7b84b 100644 (file)
--- a/docs/drivers/zink.rst
+++ b/docs/drivers/zink.rst
@@ -175,7 +175,6 @@ supported:
   * ``shaderStorageImageWriteWithoutFormat``
   * ``vertexPipelineStoresAndAtomics``
   * ``fragmentStoresAndAtomics``
-  * ``textureCompressionBC``
 
 * For Vulkan 1.2 and above:
 

diff --git a/src/gallium/drivers/zink/VP_ZINK_requirements.json b/src/gallium/drivers/zink/VP_ZINK_requirements.json
index 51bdb52..f42f4c8 100644 (file)
--- a/src/gallium/drivers/zink/VP_ZINK_requirements.json
+++ b/src/gallium/drivers/zink/VP_ZINK_requirements.json
@@ -169,8 +169,7 @@
                     "shaderStorageImageExtendedFormats": true,
                     "shaderStorageImageWriteWithoutFormat": true,
                     "vertexPipelineStoresAndAtomics": true,
-                    "fragmentStoresAndAtomics": true,
-                    "textureCompressionBC": true
+                    "fragmentStoresAndAtomics": true
                 }
             }
         },
@@ -314,6 +313,9 @@
                 "VK_EXT_non_seamless_cube_map": 1
             },
             "features": {
+                "VkPhysicalDeviceFeatures": {
+                    "textureCompressionBC": true
+                },
                 "VkPhysicalDeviceExtendedDynamicStateFeaturesEXT": {
                     "extendedDynamicState": true
                 },