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

radv: rename radv_shader_variant to radv_shader

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13548>
This commit is contained in:
Samuel Pitoiset
2021-10-27 13:20:29 +02:00
committed by Marge Bot
parent eeb034f2cc
commit 9b80f4d5f2
9 changed files with 226 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/amd/vulkan/radv_debug.c
View File

@@ -297,7 +297,7 @@ si_add_split_disasm(const char *disasm, uint64_t start_addr, unsigned *num,
}
static void
radv_dump_annotated_shader(struct radv_shader_variant *shader, gl_shader_stage stage,
radv_dump_annotated_shader(struct radv_shader *shader, gl_shader_stage stage,
struct ac_wave_info *waves, unsigned num_waves, FILE *f)
{
uint64_t start_addr, end_addr;
@@ -306,7 +306,7 @@ radv_dump_annotated_shader(struct radv_shader_variant *shader, gl_shader_stage s
if (!shader)
return;
start_addr = radv_shader_variant_get_va(shader);
start_addr = radv_shader_get_va(shader);
end_addr = start_addr + shader->code_size;
/* See if any wave executes the shader. */
@@ -403,7 +403,7 @@ radv_dump_annotated_shaders(struct radv_pipeline *pipeline, VkShaderStageFlagBit
}
static void
radv_dump_spirv(struct radv_shader_variant *shader, const char *sha1, const char *dump_dir)
radv_dump_spirv(struct radv_shader *shader, const char *sha1, const char *dump_dir)
{
char dump_path[512];
FILE *f;
@@ -418,7 +418,7 @@ radv_dump_spirv(struct radv_shader_variant *shader, const char *sha1, const char
}
static void
radv_dump_shader(struct radv_pipeline *pipeline, struct radv_shader_variant *shader,
radv_dump_shader(struct radv_pipeline *pipeline, struct radv_shader *shader,
gl_shader_stage stage, const char *dump_dir, FILE *f)
{
if (!shader)
@@ -874,7 +874,7 @@ radv_trap_handler_finish(struct radv_device *device)
if (unlikely(device->trap_handler_shader)) {
ws->buffer_make_resident(ws, device->trap_handler_shader->bo, false);
radv_shader_variant_destroy(device, device->trap_handler_shader);
radv_shader_destroy(device, device->trap_handler_shader);
}
if (unlikely(device->tma_bo)) {
@@ -886,15 +886,15 @@ radv_trap_handler_finish(struct radv_device *device)
static void
radv_dump_faulty_shader(struct radv_device *device, uint64_t faulty_pc)
{
struct radv_shader_variant *shader;
struct radv_shader *shader;
uint64_t start_addr, end_addr;
uint32_t instr_offset;
shader = radv_find_shader_variant(device, faulty_pc);
shader = radv_find_shader(device, faulty_pc);
if (!shader)
return;
start_addr = radv_shader_variant_get_va(shader);
start_addr = radv_shader_get_va(shader);
end_addr = start_addr + shader->code_size;
instr_offset = faulty_pc - start_addr;