From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 24 Oct 2018 21:16:38 +0000 (-0700)
Subject: iris: Fall back to 1x1x1 null surface if no framebuffer supplied
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=927c4a21bd6982f653a8987494f37fc36a8295e6;p=mesa.git

iris: Fall back to 1x1x1 null surface if no framebuffer supplied

If the state tracker never gave us the framebuffer dimensions via
a set_framebuffer_state() call, just fall back to the unbound texture
null surface, which is 1x1x1.  Otherwise we'd use a NULL resource
(no pun intended).
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 92589ea588c..d16f68a1d1c 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -3354,6 +3354,10 @@ use_null_surface(struct iris_batch *batch, struct iris_context *ice)
 static uint32_t
 use_null_fb_surface(struct iris_batch *batch, struct iris_context *ice)
 {
+   /* If set_framebuffer_state() was never called, fall back to 1x1x1 */
+   if (!ice->state.null_fb.res)
+      return use_null_surface(batch, ice);
+
    struct iris_bo *state_bo = iris_resource_bo(ice->state.null_fb.res);
 
    iris_use_pinned_bo(batch, state_bo, false);