From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 8 Nov 2018 06:54:25 +0000 (-0800)
Subject: iris: Fix MSAA smooth points
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e5d84bbd36dd63132854924d77102574c2ffaec0;p=mesa.git

iris: Fix MSAA smooth points

Fixes bin/ext_framebuffer_multisample-point-smooth 2 -auto -fbo
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 3d2af86c544..67f8bb782e0 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1065,7 +1065,7 @@ iris_create_rasterizer_state(struct pipe_context *ctx,
          state->line_smooth ? _10pixels : _05pixels;
       sf.LastPixelEnable = state->line_last_pixel;
       sf.LineWidth = line_width;
-      sf.SmoothPointEnable = state->point_smooth;
+      sf.SmoothPointEnable = state->point_smooth || state->multisample;
       sf.PointWidthSource = state->point_size_per_vertex ? Vertex : State;
       sf.PointWidth = state->point_size;
 
@@ -1090,7 +1090,7 @@ iris_create_rasterizer_state(struct pipe_context *ctx,
       rr.GlobalDepthOffsetConstant = state->offset_units * 2;
       rr.GlobalDepthOffsetScale = state->offset_scale;
       rr.GlobalDepthOffsetClamp = state->offset_clamp;
-      rr.SmoothPointEnable = state->point_smooth;
+      rr.SmoothPointEnable = state->point_smooth || state->multisample;
       rr.AntialiasingEnable = state->line_smooth;
       rr.ScissorRectangleEnable = state->scissor;
       rr.ViewportZNearClipTestEnable = state->depth_clip_near;