fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-22 06:20:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

aco: do not return an empty string when disassembly is not supported

Browse source 
Fixes dEQP-VK.pipeline.executable_properties.* on GFX6-7 when
clrxdisasm isn't found. Other generations are also affected if RADV
is built without LLVM.

Cc: 21.3 mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Tony Wasserka <tony.wasserka@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13333>
(cherry picked from commit aac4e1f822)
This commit is contained in:
Samuel Pitoiset 2021-10-13 13:05:54 +02:00 • committed by Eric Engestrom
parent 2dcee84ce3
commit 7cddbaab2d
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1624,7 +1624,7 @@
"description": "aco: do not return an empty string when disassembly is not supported",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

7
src/amd/compiler/aco_interface.cpp
View file

@ -213,11 +213,12 @@ aco_compile_shader(unsigned shader_count, struct nir_shader* const* shaders,
size += disasm_size;
free(data);
} else {
fprintf(stderr, "Shader disassembly is not supported in the current configuration"
disasm = "Shader disassembly is not supported in the current configuration"
#ifndef LLVM_AVAILABLE
" (LLVM not available)"
" (LLVM not available)"
#endif
".\n");
".\n";
size += disasm.length();
}
}