OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be4250a
)
radeonsi: fix a crash if ps_shader.cso is NULL in si_get_total_colormask
author
Marek Olšák
<marek.olsak@amd.com>
Thu, 5 Apr 2018 19:53:52 +0000
(15:53 -0400)
committer
Marek Olšák
<marek.olsak@amd.com>
Thu, 5 Apr 2018 19:53:52 +0000
(15:53 -0400)
src/gallium/drivers/radeonsi/si_pipe.h
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/radeonsi/si_pipe.h
b/src/gallium/drivers/radeonsi/si_pipe.h
index
a794633
..
9fb18a8
100644
(file)
--- a/
src/gallium/drivers/radeonsi/si_pipe.h
+++ b/
src/gallium/drivers/radeonsi/si_pipe.h
@@
-1237,6
+1237,9
@@
static inline unsigned si_get_total_colormask(struct si_context *sctx)
return 0;
struct si_shader_selector *ps = sctx->ps_shader.cso;
+ if (!ps)
+ return 0;
+
unsigned colormask = sctx->framebuffer.colorbuf_enabled_4bit &
sctx->queued.named.blend->cb_target_mask;