diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-09-10 18:15:40 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-09-24 19:51:42 +0200 |
| commit | 394d67a58f949245e8b3fad400e9efaa5829ec84 (patch) | |
| tree | eb7da600ed27a4982e92b411618eda6566dd5277 /src/gallium | |
| parent | dea834e639715caa9517a695a3fb04d5de9aa069 (diff) | |
| download | external_mesa3d-394d67a58f949245e8b3fad400e9efaa5829ec84.zip external_mesa3d-394d67a58f949245e8b3fad400e9efaa5829ec84.tar.gz external_mesa3d-394d67a58f949245e8b3fad400e9efaa5829ec84.tar.bz2 | |
radeonsi: report alloc failure from si_shader_binary_read
Cc: 11.0 <mesa-stable@lists.freedesktop.org>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 2e49a21..a3df648 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -3774,11 +3774,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)) { |