AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: avoid crashing on unbound constant resources

Browse Source 
instead, read from the workaround BO
This commit is contained in:
Kenneth Graunke
2018-06-19 23:37:10 -07:00
parent a7770501a7
commit 26db2ea782
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/iris/iris_state.c
+6 -2
View File
@@ -2290,7 +2290,10 @@ iris_restore_context_saved_bos(struct iris_context *ice,
struct iris_const_buffer *cbuf = &shs->constbuf[range->block];
struct iris_resource *res = (void *) cbuf->resource;
iris_use_pinned_bo(batch, res->bo, false);
if (res)
iris_use_pinned_bo(batch, res->bo, false);
else
iris_use_pinned_bo(batch, batch->screen->workaround_bo, false);
}
}
@@ -2467,7 +2470,8 @@ iris_upload_render_state(struct iris_context *ice,
pkt.ConstantBody.ReadLength[n] = range->length;
pkt.ConstantBody.Buffer[n] =
ro_bo(res->bo, range->start * 32 + cbuf->offset);
res ? ro_bo(res->bo, range->start * 32 + cbuf->offset)
: ro_bo(batch->screen->workaround_bo, 0);
n--;
}
}