zink: move blend_operation_advanced conditions to zink_device_info.py

Acked-by: Adam Jackson <ajax@redhat.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7756>

diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py
index cbe5544..ffd0afc 100644 (file)
--- a/src/gallium/drivers/zink/zink_device_info.py
+++ b/src/gallium/drivers/zink/zink_device_info.py
@@ -96,7 +96,9 @@ def EXTENSIONS():
             conditions=["$feats.customBorderColors"]),
         Extension("VK_EXT_blend_operation_advanced",
             alias="blend",
-            properties=True),
+            properties=True,
+            # TODO: we can probably support non-premul here with some work?
+            conditions=["$props.advancedBlendNonPremultipliedSrcColor", "$props.advancedBlendNonPremultipliedDstColor"]),
         Extension("VK_EXT_extended_dynamic_state",
             alias="dynamic_state",
             features=True,

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 796319d..68938f1 100644 (file)
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1132,11 +1132,6 @@ zink_internal_create_screen(struct sw_winsys *winsys, int fd, const struct pipe_
    qci.queueCount = 1;
    qci.pQueuePriorities = &dummy;
 
-   /* TODO: we can probably support non-premul here with some work? */
-   screen->info.have_EXT_blend_operation_advanced = screen->info.have_EXT_blend_operation_advanced &&
-                                                    screen->info.blend_props.advancedBlendNonPremultipliedSrcColor &&
-                                                    screen->info.blend_props.advancedBlendNonPremultipliedDstColor;
-
    VkDeviceCreateInfo dci = {};
    dci.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
    dci.queueCreateInfoCount = 1;