summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2015-09-10 18:15:40 +0200
committerEmil Velikov <[email protected]>2015-10-07 14:10:03 +0100
commitdacccf8e2285673fe1cb82daa69cda3337612f1f (patch)
tree1c09249563b4643029f9f431f3b9901f66f901c3 /src
parent288d9a06cc3dab54947ee0a1aa7348430ac663bb (diff)
radeonsi: report alloc failure from si_shader_binary_read
Cc: 11.0 <[email protected]> Acked-by: Christian König <[email protected]> Reviewed-by: Michel Dänzer <[email protected]> (cherry picked from commit 394d67a58f949245e8b3fad400e9efaa5829ec84)
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/radeonsi/si_shader.c5
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 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)) {