From dacccf8e2285673fe1cb82daa69cda3337612f1f Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Thu, 10 Sep 2015 18:15:40 +0200 Subject: radeonsi: report alloc failure from si_shader_binary_read MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: 11.0 Acked-by: Christian König Reviewed-by: Michel Dänzer (cherry picked from commit 394d67a58f949245e8b3fad400e9efaa5829ec84) --- src/gallium/drivers/radeonsi/si_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/gallium') diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index d493329b31a..1010b6e2491 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -3829,11 +3829,14 @@ int si_shader_binary_read(struct si_screen *sscreen, struct si_shader *shader) { const struct radeon_shader_binary *binary = &shader->binary; unsigned i; + int r; bool dump = r600_can_dump_shader(&sscreen->b, shader->selector ? shader->selector->tokens : NULL); si_shader_binary_read_config(sscreen, shader, 0); - si_shader_binary_upload(sscreen, shader); + r = si_shader_binary_upload(sscreen, shader); + if (r) + return r; if (dump) { if (!(sscreen->b.debug_flags & DBG_NO_ASM)) { -- cgit v1.2.3