From 9da54b92529017e4add1e64017954f46f0e17991 Mon Sep 17 00:00:00 2001 From: Caio Marcelo de Oliveira Filho Date: Thu, 11 Feb 2021 12:19:13 -0800 Subject: [PATCH] intel/compiler: Use gl_varying_slot_name_for_stage() Reviewed-by: Kenneth Graunke Reviewed-by: Christian Gmeiner Part-of: --- src/intel/compiler/brw_compiler.h | 3 ++- src/intel/compiler/brw_shader.cpp | 5 +++-- src/intel/compiler/brw_vec4.cpp | 2 +- src/intel/compiler/brw_vec4_gs_visitor.cpp | 4 ++-- src/intel/compiler/brw_vec4_tcs.cpp | 4 ++-- src/intel/compiler/brw_vue_map.c | 11 ++++++----- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h index 0721a24f893..dd09ad0b3a5 100644 --- a/src/intel/compiler/brw_compiler.h +++ b/src/intel/compiler/brw_compiler.h @@ -1132,7 +1132,8 @@ struct brw_vue_map { int num_per_vertex_slots; }; -void brw_print_vue_map(FILE *fp, const struct brw_vue_map *vue_map); +void brw_print_vue_map(FILE *fp, const struct brw_vue_map *vue_map, + gl_shader_stage stage); /** * Convert a VUE slot number into a byte offset within the VUE. diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp index f1d116bbe1c..a50559a245d 100644 --- a/src/intel/compiler/brw_shader.cpp +++ b/src/intel/compiler/brw_shader.cpp @@ -1364,9 +1364,10 @@ brw_compile_tes(const struct brw_compiler *compiler, if (INTEL_DEBUG & DEBUG_TES) { fprintf(stderr, "TES Input "); - brw_print_vue_map(stderr, input_vue_map); + brw_print_vue_map(stderr, input_vue_map, MESA_SHADER_TESS_EVAL); fprintf(stderr, "TES Output "); - brw_print_vue_map(stderr, &prog_data->base.vue_map); + brw_print_vue_map(stderr, &prog_data->base.vue_map, + MESA_SHADER_TESS_EVAL); } if (is_scalar) { diff --git a/src/intel/compiler/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp index b00c31c6b39..1cd7e6e5d01 100644 --- a/src/intel/compiler/brw_vec4.cpp +++ b/src/intel/compiler/brw_vec4.cpp @@ -2935,7 +2935,7 @@ brw_compile_vs(const struct brw_compiler *compiler, void *log_data, if (INTEL_DEBUG & DEBUG_VS) { fprintf(stderr, "VS Output "); - brw_print_vue_map(stderr, &prog_data->base.vue_map); + brw_print_vue_map(stderr, &prog_data->base.vue_map, MESA_SHADER_VERTEX); } if (is_scalar) { diff --git a/src/intel/compiler/brw_vec4_gs_visitor.cpp b/src/intel/compiler/brw_vec4_gs_visitor.cpp index 3c8ab531215..b9bc1834e86 100644 --- a/src/intel/compiler/brw_vec4_gs_visitor.cpp +++ b/src/intel/compiler/brw_vec4_gs_visitor.cpp @@ -812,9 +812,9 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data, */ if (INTEL_DEBUG & DEBUG_GS) { fprintf(stderr, "GS Input "); - brw_print_vue_map(stderr, &c.input_vue_map); + brw_print_vue_map(stderr, &c.input_vue_map, MESA_SHADER_GEOMETRY); fprintf(stderr, "GS Output "); - brw_print_vue_map(stderr, &prog_data->base.vue_map); + brw_print_vue_map(stderr, &prog_data->base.vue_map, MESA_SHADER_GEOMETRY); } if (is_scalar) { diff --git a/src/intel/compiler/brw_vec4_tcs.cpp b/src/intel/compiler/brw_vec4_tcs.cpp index a358b21daf1..70cc1f359c4 100644 --- a/src/intel/compiler/brw_vec4_tcs.cpp +++ b/src/intel/compiler/brw_vec4_tcs.cpp @@ -450,9 +450,9 @@ brw_compile_tcs(const struct brw_compiler *compiler, if (INTEL_DEBUG & DEBUG_TCS) { fprintf(stderr, "TCS Input "); - brw_print_vue_map(stderr, &input_vue_map); + brw_print_vue_map(stderr, &input_vue_map, MESA_SHADER_TESS_CTRL); fprintf(stderr, "TCS Output "); - brw_print_vue_map(stderr, &vue_prog_data->vue_map); + brw_print_vue_map(stderr, &vue_prog_data->vue_map, MESA_SHADER_TESS_CTRL); } if (is_scalar) { diff --git a/src/intel/compiler/brw_vue_map.c b/src/intel/compiler/brw_vue_map.c index df5cf5908cc..5b73088f833 100644 --- a/src/intel/compiler/brw_vue_map.c +++ b/src/intel/compiler/brw_vue_map.c @@ -278,12 +278,12 @@ brw_compute_tess_vue_map(struct brw_vue_map *vue_map, } static const char * -varying_name(brw_varying_slot slot) +varying_name(brw_varying_slot slot, gl_shader_stage stage) { assume(slot < BRW_VARYING_SLOT_COUNT); if (slot < VARYING_SLOT_MAX) - return gl_varying_slot_name((gl_varying_slot)slot); + return gl_varying_slot_name_for_stage((gl_varying_slot)slot, stage); static const char *brw_names[] = { [BRW_VARYING_SLOT_NDC - VARYING_SLOT_MAX] = "BRW_VARYING_SLOT_NDC", @@ -295,7 +295,8 @@ varying_name(brw_varying_slot slot) } void -brw_print_vue_map(FILE *fp, const struct brw_vue_map *vue_map) +brw_print_vue_map(FILE *fp, const struct brw_vue_map *vue_map, + gl_shader_stage stage) { if (vue_map->num_per_vertex_slots > 0 || vue_map->num_per_patch_slots > 0) { fprintf(fp, "PUE map (%d slots, %d/patch, %d/vertex, %s)\n", @@ -309,7 +310,7 @@ brw_print_vue_map(FILE *fp, const struct brw_vue_map *vue_map) vue_map->slot_to_varying[i] - VARYING_SLOT_PATCH0); } else { fprintf(fp, " [%d] %s\n", i, - varying_name(vue_map->slot_to_varying[i])); + varying_name(vue_map->slot_to_varying[i], stage)); } } } else { @@ -317,7 +318,7 @@ brw_print_vue_map(FILE *fp, const struct brw_vue_map *vue_map) vue_map->num_slots, vue_map->separate ? "SSO" : "non-SSO"); for (int i = 0; i < vue_map->num_slots; i++) { fprintf(fp, " [%d] %s\n", i, - varying_name(vue_map->slot_to_varying[i])); + varying_name(vue_map->slot_to_varying[i], stage)); } } fprintf(fp, "\n"); -- 2.34.1