From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 24 Jul 2018 17:59:10 +0000 (-0700)
Subject: iris: hack around samples confusion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3aa1fcc65a51c0e15d18c608da9b4f3009d4ab2d;p=mesa.git

iris: hack around samples confusion
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index aa92b572675..10fcf9da1db 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1365,7 +1365,9 @@ iris_set_framebuffer_state(struct pipe_context *ctx,
    struct isl_device *isl_dev = &screen->isl_dev;
    struct pipe_framebuffer_state *cso = &ice->state.framebuffer;
 
-   if (cso->samples != state->samples) {
+   unsigned samples = util_framebuffer_get_num_samples(state);
+
+   if (cso->samples != samples) {
       ice->state.dirty |= IRIS_DIRTY_MULTISAMPLE;
    }
 
@@ -1378,6 +1380,7 @@ iris_set_framebuffer_state(struct pipe_context *ctx,
    }
 
    util_copy_framebuffer_state(cso, state);
+   cso->samples = samples;
 
    struct iris_depth_buffer_state *cso_z = &ice->state.genx->depth_buffer;