fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: change PIPE_SHADER to MESA_SHADER (si_dump_descriptors)

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6340>
This commit is contained in:
Marek Olšák 2020-08-14 23:56:05 -04:00
parent 966307983b
commit 23fdb79e92
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/radeonsi/si_debug.c
View file

@ -777,9 +777,10 @@ static unsigned si_identity(unsigned slot)
return slot; return slot;
} }
static void si_dump_descriptors(struct si_context *sctx, enum pipe_shader_type processor, static void si_dump_descriptors(struct si_context *sctx, gl_shader_stage stage,
const struct si_shader_info *info, struct u_log_context *log) const struct si_shader_info *info, struct u_log_context *log)
{ {
enum pipe_shader_type processor = pipe_shader_type_from_mesa(stage);
struct si_descriptors *descs = struct si_descriptors *descs =
&sctx->descriptors[SI_DESCS_FIRST_SHADER + processor * SI_NUM_SHADER_DESCS]; &sctx->descriptors[SI_DESCS_FIRST_SHADER + processor * SI_NUM_SHADER_DESCS];
static const char *shader_name[] = {"VS", "PS", "GS", "TCS", "TES", "CS"}; static const char *shader_name[] = {"VS", "PS", "GS", "TCS", "TES", "CS"};
@ -807,7 +808,7 @@ static void si_dump_descriptors(struct si_context *sctx, enum pipe_shader_type p
enabled_images = sctx->images[processor].enabled_mask; enabled_images = sctx->images[processor].enabled_mask;
} }
if (processor == PIPE_SHADER_VERTEX && sctx->vb_descriptors_buffer && if (stage == MESA_SHADER_VERTEX && sctx->vb_descriptors_buffer &&
sctx->vb_descriptors_gpu_list && sctx->vertex_elements) { sctx->vb_descriptors_gpu_list && sctx->vertex_elements) {
assert(info); /* only CS may not have an info struct */ assert(info); /* only CS may not have an info struct */
struct si_descriptors desc = {}; struct si_descriptors desc = {};
@ -842,7 +843,7 @@ static void si_dump_gfx_descriptors(struct si_context *sctx,
if (!state->cso || !state->current) if (!state->cso || !state->current)
return; return;
si_dump_descriptors(sctx, state->cso->type, &state->cso->info, log); si_dump_descriptors(sctx, state->cso->info.stage, &state->cso->info, log);
} }
static void si_dump_compute_descriptors(struct si_context *sctx, struct u_log_context *log) static void si_dump_compute_descriptors(struct si_context *sctx, struct u_log_context *log)
@ -850,7 +851,7 @@ static void si_dump_compute_descriptors(struct si_context *sctx, struct u_log_co
if (!sctx->cs_shader_state.program) if (!sctx->cs_shader_state.program)
return; return;
si_dump_descriptors(sctx, PIPE_SHADER_COMPUTE, NULL, log); si_dump_descriptors(sctx, MESA_SHADER_COMPUTE, NULL, log);
} }
struct si_shader_inst { struct si_shader_inst {