broadcom/vc4: Fix crashes since the gallium blitter reworks.

Even if we're not clearing color, the blitter has started dereferencing the color value.
2017-09-18 12:58:05 -07:00
parent 9940fb4205
commit 4db9ad9893
1 changed files with 3 additions and 1 deletions
@@ -517,6 +517,8 @@ vc4_clear(struct pipe_context *pctx, unsigned buffers,
                     zsclear == PIPE_CLEAR_STENCIL) &&
                    (rsc->initialized_buffers & ~(zsclear | job->cleared)) &&
                    util_format_is_depth_and_stencil(vc4->framebuffer.zsbuf->format)) {
+                        static const union pipe_color_union dummy_color = {};
+
                        perf_debug("Partial clear of Z+stencil buffer, "
                                   "drawing a quad instead of fast clearing\n");
                        vc4_blitter_save(vc4);
@@ -525,7 +527,7 @@ vc4_clear(struct pipe_context *pctx, unsigned buffers,
                                           vc4->framebuffer.height,
                                           1,
                                           zsclear,
-                                           NULL, depth, stencil);
+                                           &dummy_color, depth, stencil);
                        buffers &= ~zsclear;
                        if (!buffers)
                                return;