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

radeonsi: change PIPE_SHADER to MESA_SHADER (si_shader_selector::type)

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 14391533f8
commit b1cb72c449
10 changed files with 198 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/drivers/radeonsi/si_debug.c
View File

@@ -873,11 +873,11 @@ struct si_shader_inst {
static void si_add_split_disasm(struct si_screen *screen, struct ac_rtld_binary *rtld_binary,
struct si_shader_binary *binary, uint64_t *addr, unsigned *num,
struct si_shader_inst *instructions,
enum pipe_shader_type shader_type, unsigned wave_size)
gl_shader_stage stage, unsigned wave_size)
{
if (!ac_rtld_open(rtld_binary, (struct ac_rtld_open_info){
.info = &screen->info,
.shader_type = tgsi_processor_to_shader_stage(shader_type),
.shader_type = stage,
.wave_size = wave_size,
.num_parts = 1,
.elf_ptrs = &binary->elf_buffer,
@@ -925,7 +925,7 @@ static void si_print_annotated_shader(struct si_shader *shader, struct ac_wave_i
return;
struct si_screen *screen = shader->selector->screen;
enum pipe_shader_type shader_type = shader->selector->type;
gl_shader_stage stage = shader->selector->info.stage;
uint64_t start_addr = shader->bo->gpu_address;
uint64_t end_addr = start_addr + shader->bo->b.b.width0;
unsigned i;
@@ -954,21 +954,21 @@ static void si_print_annotated_shader(struct si_shader *shader, struct ac_wave_i
if (shader->prolog) {
si_add_split_disasm(screen, &rtld_binaries[0], &shader->prolog->binary, &inst_addr, &num_inst,
instructions, shader_type, wave_size);
instructions, stage, wave_size);
}
if (shader->previous_stage) {
si_add_split_disasm(screen, &rtld_binaries[1], &shader->previous_stage->binary, &inst_addr,
&num_inst, instructions, shader_type, wave_size);
&num_inst, instructions, stage, wave_size);
}
if (shader->prolog2) {
si_add_split_disasm(screen, &rtld_binaries[2], &shader->prolog2->binary, &inst_addr,
&num_inst, instructions, shader_type, wave_size);
&num_inst, instructions, stage, wave_size);
}
si_add_split_disasm(screen, &rtld_binaries[3], &shader->binary, &inst_addr, &num_inst,
instructions, shader_type, wave_size);
instructions, stage, wave_size);
if (shader->epilog) {
si_add_split_disasm(screen, &rtld_binaries[4], &shader->epilog->binary, &inst_addr, &num_inst,
instructions, shader_type, wave_size);
instructions, stage, wave_size);
}
fprintf(f, COLOR_YELLOW "%s - annotated disassembly:" COLOR_RESET "\n",