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

intel/compiler: Use gl_varying_slot_name_for_stage()

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8998>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2021-02-11 12:19:13 -08:00
committed by Marge Bot
parent 3fc8da13f6
commit 9da54b9252
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/intel/compiler/brw_compiler.h
View File

@@ -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.

5
src/intel/compiler/brw_shader.cpp
View File

@@ -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) {

2
src/intel/compiler/brw_vec4.cpp
View File

@@ -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) {

4
src/intel/compiler/brw_vec4_gs_visitor.cpp
View File

@@ -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) {

4
src/intel/compiler/brw_vec4_tcs.cpp
View File

@@ -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) {

11
src/intel/compiler/brw_vue_map.c
View File

@@ -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");