From 3f1d4de25b22fe377c018feedf01d77d9da8e632 Mon Sep 17 00:00:00 2001 From: Hoe Hao Cheng Date: Wed, 25 Nov 2020 01:56:56 +0800 Subject: [PATCH] zink: move blend_operation_advanced conditions to zink_device_info.py Acked-by: Adam Jackson Acked-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/zink/zink_device_info.py | 4 +++- src/gallium/drivers/zink/zink_screen.c | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py index cbe55448947..ffd0afc974b 100644 --- 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 796319d6ee5..68938f16fa7 100644 --- 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;