Mesa (staging/21.0): iris: clamp PointWidth in 3DSTATE_SF like i965 does

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: c5c7d6a05a1c89e8e4a9914c22e5cd66e4f030a7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5c7d6a05a1c89e8e4a9914c22e5cd66e4f030a7

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Mar 30 16:57:49 2021 +0300

iris: clamp PointWidth in 3DSTATE_SF like i965 does

Values match how MinimumPointWidth, MaximumPointWidth is setup. This
fixes assert hit in debug build when packing the struct with too large
value for genxml.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9942>
(cherry picked from commit b2af419391d0cab7ad5a36fbe3b4f3d2cddfa3db)

---

 .pick_status.json                     | 2 +-
 src/gallium/drivers/iris/iris_state.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 64be840207c..c697fc9e507 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -229,7 +229,7 @@
         "description": "iris: clamp PointWidth in 3DSTATE_SF like i965 does",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index e543d12d1c9..3ee01b5fb19 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1761,7 +1761,7 @@ iris_create_rasterizer_state(struct pipe_context *ctx,
       sf.SmoothPointEnable = (state->point_smooth || state->multisample) &&
                              !state->point_quad_rasterization;
       sf.PointWidthSource = state->point_size_per_vertex ? Vertex : State;
-      sf.PointWidth = state->point_size;
+      sf.PointWidth = CLAMP(state->point_size, 0.125f, 255.875f);
 
       if (state->flatshade_first) {
          sf.TriangleFanProvokingVertexSelect = 1;