fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 02:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: make zink-anv-adl jobs use descriptor buffer

Browse source 
this enables shader object usage to catch more bugs

...also demote a related warning to debug

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37199>
This commit is contained in:
Mike Blumenkrantz 2025-09-05 11:24:26 -04:00 • committed by Marge Bot
parent 5f5fda147a
commit 3dc68c0f86
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/zink/ci/gitlab-ci.yml
View file

@ -68,6 +68,7 @@ zink-anv-adl:
DEQP_SUITE: zink-anv-adl
PIGLIT_NO_WINDOW: 1
HWCI_START_WESTON: 1
ZINK_DESCRIPTORS: db
# We use gbm because its a copy of tgl job
PIGLIT_PLATFORM: gbm
FDO_CI_CONCURRENT: 6 # higher is too much, and leads to OOM
@ -89,6 +90,7 @@ zink-anv-adl-traces:
extends:
- .zink-anv-adl-trace-test
variables:
ZINK_DESCRIPTORS: db
PIGLIT_TRACES_FILE: traces-zink.yml
zink-anv-adl-traces-restricted:
@ -96,6 +98,7 @@ zink-anv-adl-traces-restricted:
- .zink-anv-adl-trace-test
- .zink-anv-rules-restricted
variables:
ZINK_DESCRIPTORS: db
PIGLIT_TRACES_FILE: traces-zink-restricted.yml
PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PRIVATE_BUCKET} --jwt-file=${S3_JWT_FILE}
allow_failure: true
@ -109,6 +112,7 @@ zink-anv-adl-traces-performance:
- !reference [.piglit-performance-base, rules]
- !reference [.zink-anv-manual-rules, rules]
variables:
ZINK_DESCRIPTORS: db
PIGLIT_TRACES_FILE: traces-zink.yml
zink-anv-tgl:

8
src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt
View file

@ -665,3 +665,11 @@ wayland-dEQP-EGL.functional.resize.surface_size.grow,Fail
wayland-dEQP-EGL.functional.resize.surface_size.shrink,Fail
wayland-dEQP-EGL.functional.resize.surface_size.stretch_height,Fail
wayland-dEQP-EGL.functional.resize.surface_size.stretch_width,Fail
# shader objects #13839
KHR-GL46.separable_programs_tf.tessellation_active,Fail
spec@arb_fragment_program@fog-modes,Crash
spec@arb_separate_shader_objects@mix-and-match-tcs-tes,Fail
spec@arb_occlusion_query@occlusion_query_meta_fragments,Fail
spec@arb_occlusion_query@occlusion_query_meta_save,Fail

2
src/gallium/drivers/zink/ci/zink-anv-adl-validation-settings.txt
View file

@ -1,6 +1,6 @@
# Please include a comment with the log message and a testcase triggering each
# VUID at the bottom of the file.
khronos_validation.message_id_filter = VUID-VkPhysicalDeviceProperties2-pNext-pNext,VUID-VkDeviceCreateInfo-pNext-pNext,VUID-RuntimeSpirv-Location-06272,VUID-vkCmdDrawMultiIndexedEXT-format-07753,VUID-RuntimeSpirv-OpEntryPoint-08743,VUID-vkCmdDrawMultiIndexedEXT-None-10909,VUID-vkDestroyDevice-device-05137
khronos_validation.message_id_filter = VUID-VkPhysicalDeviceProperties2-pNext-pNext,VUID-VkDeviceCreateInfo-pNext-pNext,VUID-RuntimeSpirv-Location-06272,VUID-vkCmdDrawMultiIndexedEXT-format-07753,VUID-RuntimeSpirv-OpEntryPoint-08743,VUID-vkCmdDrawMultiIndexedEXT-None-10909,VUID-vkDestroyDevice-device-05137,VUID-vkCmdDrawMultiEXT-None-08879,VUID-VkShaderCreateInfoEXT-pSetLayouts-parameter,VUID-vkCmdDrawMultiIndexedEXT-None-08879
khronos_validation.report_flags = error
khronos_validation.debug_action = VK_DBG_LAYER_ACTION_LOG_MSG,VK_DBG_LAYER_ACTION_BREAK
VK_LAYER_ENABLES=VK_VALIDATION_FEATURE_ENABLE_DEBUG_PRINTF_EXT

2
src/gallium/drivers/zink/zink_screen.c
View file

@ -3604,7 +3604,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev
if (screen->info.db_props.maxDescriptorBufferBindings < 2 || screen->info.db_props.maxSamplerDescriptorBufferBindings < 2) {
if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB) {
/* allow for testing, but disable bindless */
mesa_logw("Cannot use bindless and db descriptor mode with (maxDescriptorBufferBindings||maxSamplerDescriptorBufferBindings) < 2");
mesa_logd("Cannot use bindless and db descriptor mode with (maxDescriptorBufferBindings||maxSamplerDescriptorBufferBindings) < 2");
} else {
can_db = false;
}