<div dir="ltr"><div><div>Even though I've already fixed the crash in master, I'd like to have this patch in master too.<br><br></div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>><br><br></div>Marek<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Apr 5, 2018 at 4:49 PM, Jan Vesely <span dir="ltr"><<a href="mailto:jan.vesely@rutgers.edu" target="_blank">jan.vesely@rutgers.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">si_get_total_colormask accesses NULL pointer on compute shaders<br>
Fixes crashes on clover<br>
Fixes: 0669dca9c00261849cee14d69fdea0<wbr>a5e323c7f7 ("radeonsi: skip DCC render feedback checking if color writes are disabled")<br>
CC: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>><br>
Signed-off-by: Jan Vesely <<a href="mailto:jan.vesely@rutgers.edu">jan.vesely@rutgers.edu</a>><br>
---<br>
src/gallium/drivers/radeonsi/<wbr>si_blit.c | 6 +++---<br>
1 file changed, 3 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/src/gallium/drivers/<wbr>radeonsi/si_blit.c b/src/gallium/drivers/<wbr>radeonsi/si_blit.c<br>
index 40f512a682..35506dd74b 100644<br>
--- a/src/gallium/drivers/<wbr>radeonsi/si_blit.c<br>
+++ b/src/gallium/drivers/<wbr>radeonsi/si_blit.c<br>
@@ -710,15 +710,15 @@ static void si_check_render_feedback_<wbr>resident_images(struct si_context *sctx)<br>
<br>
static void si_check_render_feedback(<wbr>struct si_context *sctx)<br>
{<br>
+ if (!sctx->need_check_render_<wbr>feedback)<br>
+ return;<br>
+<br>
/* There is no render feedback if color writes are disabled.<br>
* (e.g. a pixel shader with image stores)<br>
*/<br>
if (!si_get_total_colormask(sctx)<wbr>)<br>
return;<br>
<br>
- if (!sctx->need_check_render_<wbr>feedback)<br>
- return;<br>
-<br>
for (int i = 0; i < SI_NUM_SHADERS; ++i) {<br>
si_check_render_feedback_<wbr>images(sctx, &sctx->images[i]);<br>
si_check_render_feedback_<wbr>textures(sctx, &sctx->samplers[i]);<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.14.3<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>