Mesa (master): radeonsi: cope with missing disassembly

Nicolai Hähnle nh at kemper.freedesktop.org
Fri Apr 14 20:51:55 UTC 2017


Module: Mesa
Branch: master
Commit: d6588d9962e8bf3965f2d333101ea8179a176d19
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d6588d9962e8bf3965f2d333101ea8179a176d19

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Fri Mar 31 13:03:03 2017 +0200

radeonsi: cope with missing disassembly

For robustness and testing purposes.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeonsi/si_state_shaders.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 78c7495ce8..c52ffd90f7 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -113,7 +113,8 @@ static void *si_get_shader_binary(struct si_shader *shader)
 	/* There is always a size of data followed by the data itself. */
 	unsigned relocs_size = shader->binary.reloc_count *
 			       sizeof(shader->binary.relocs[0]);
-	unsigned disasm_size = strlen(shader->binary.disasm_string) + 1;
+	unsigned disasm_size = shader->binary.disasm_string ?
+			       strlen(shader->binary.disasm_string) + 1 : 0;
 	unsigned llvm_ir_size = shader->binary.llvm_ir_string ?
 				strlen(shader->binary.llvm_ir_string) + 1 : 0;
 	unsigned size =




More information about the mesa-commit mailing list