From 793276cd8b358738f6fcb1d8500b1858ca77748b Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 20 Jan 2018 00:59:49 -0800 Subject: [PATCH] iris: msaa sample count packing problems 0 -> ffffffffffffffffffffffffffff --- src/gallium/drivers/iris/iris_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 96eea8511d2..348647d9aea 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -483,7 +483,6 @@ iris_create_rasterizer_state(struct pipe_context *ctx, cso->flatshade = state->flatshade; cso->light_twoside = state->light_twoside; cso->rasterizer_discard = state->rasterizer_discard; - // for 3DSTATE_MULTISAMPLE, if we want it. cso->half_pixel_center = state->half_pixel_center; iris_pack_command(GENX(3DSTATE_SF), cso->sf, sf) { @@ -1398,7 +1397,8 @@ iris_upload_render_state(struct iris_context *ice, iris_emit_cmd(batch, GENX(3DSTATE_MULTISAMPLE), ms) { ms.PixelLocation = ice->state.cso_rast->half_pixel_center ? CENTER : UL_CORNER; - ms.NumberofMultisamples = ffs(ice->state.framebuffer.samples) - 1; + if (ice->state.framebuffer.samples > 0) + ms.NumberofMultisamples = ffs(ice->state.framebuffer.samples) - 1; } } -- 2.30.2