Module: Mesa Branch: master Commit: 98698c4d01ffc3c14a2e7170fd0059598b04d26a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=98698c4d01ffc3c14a2e7170fd0059598b04d26a
Author: Alejandro Piñeiro <[email protected]> Date: Wed Apr 14 12:35:03 2021 +0200 v3dv/debug: print correct stage name Reviewed-by: Iago Toral Quiroga <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10229> --- src/broadcom/vulkan/v3dv_pipeline.c | 4 ++-- src/broadcom/vulkan/v3dv_private.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index 35cf35592a8..2ed965353c0 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -475,7 +475,7 @@ shader_module_compile_to_nir(struct v3dv_device *device, if (V3D_DEBUG & (V3D_DEBUG_NIR | v3d_debug_flag_for_shader_stage(stage->stage))) { fprintf(stderr, "Initial form: %s prog %d NIR:\n", - gl_shader_stage_name(stage->stage), + broadcom_shader_stage_name(stage->stage), stage->program_id); nir_print_shader(nir, stderr); fprintf(stderr, "\n"); @@ -1456,7 +1456,7 @@ pipeline_compile_shader_variant(struct v3dv_pipeline_stage *p_stage, if (V3D_DEBUG & (V3D_DEBUG_NIR | v3d_debug_flag_for_shader_stage(p_stage->stage))) { fprintf(stderr, "Just before v3d_compile: %s prog %d NIR:\n", - gl_shader_stage_name(p_stage->stage), + broadcom_shader_stage_name(p_stage->stage), p_stage->program_id); nir_print_shader(p_stage->nir, stderr); fprintf(stderr, "\n"); diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h index 5a9f0e2dac9..8a9943bdf32 100644 --- a/src/broadcom/vulkan/v3dv_private.h +++ b/src/broadcom/vulkan/v3dv_private.h @@ -326,6 +326,17 @@ broadcom_shader_stage_to_gl(broadcom_shader_stage stage) } } +static inline const char * +broadcom_shader_stage_name(broadcom_shader_stage stage) +{ + switch(stage) { + case BROADCOM_SHADER_VERTEX_BIN: + return "MESA_SHADER_VERTEX_BIN"; + default: + return gl_shader_stage_name(broadcom_shader_stage_to_gl(stage)); + } +} + struct v3dv_pipeline_cache { struct vk_object_base base; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
