OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: untangle have_EXT_debug_utils and ZINK_DEBUG_VALIDATION

Browse Source 
EXT_debug_utils is useful for more than just validation, so let's
untangle these a bit.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11004>
This commit is contained in:
Erik Faye-Lund
2021-05-26 14:30:27 +02:00
committed by Marge Bot
parent ba392e9511
commit 6c03a85094
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/zink/zink_instance.py
View File

@@ -55,9 +55,9 @@ EXTENSIONS = [
LAYERS = [
# if we have debug_util, allow a validation layer to be added.
Layer("VK_LAYER_KHRONOS_validation",
conditions=["have_EXT_debug_utils"]),
conditions=["zink_debug & ZINK_DEBUG_VALIDATION"]),
Layer("VK_LAYER_LUNARG_standard_validation",
conditions=["have_EXT_debug_utils", "!have_layer_KHRONOS_validation"]),
conditions=["zink_debug & ZINK_DEBUG_VALIDATION", "!have_layer_KHRONOS_validation"]),
]
REPLACEMENTS = {
@@ -146,11 +146,6 @@ zink_create_instance(struct zink_instance_info *instance_info)
}
}
// Clear have_EXT_debug_utils if we do not want debug info
if (!(zink_debug & ZINK_DEBUG_VALIDATION)) {
have_EXT_debug_utils = false;
}
// Build up the layers from the reported ones
uint32_t layer_count = 0;

3
src/gallium/drivers/zink/zink_screen.c
View File

@@ -1612,7 +1612,8 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
if (!screen->instance)
goto fail;
if (screen->instance_info.have_EXT_debug_utils && !create_debug(screen))
if (screen->instance_info.have_EXT_debug_utils &&
(zink_debug & ZINK_DEBUG_VALIDATION) && !create_debug(screen))
debug_printf("ZINK: failed to setup debug utils\n");
choose_pdev(screen);