diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-11-24 10:52:45 +1000 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-11-24 22:08:24 -0800 |
| commit | 0464d64d6cea76eac72f6e13bff9e7efeb9833ac (patch) | |
| tree | 8a0a8061a5a47262089198064447c2f291d7e0e8 | |
| parent | e9cdf398fa29f1cb21b2f4e534fa9611bd857431 (diff) | |
gallium: fix missing bit field in p_state.h
Marek pointed this out, not sure how we missed it.
Fixes: 3dc6da1ac1f5 ("gallium: add a non-multisample sample mask out behaviour flag.")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7741>
(cherry picked from commit 105fc1c615eb4963503c738c68766f830bc5a662)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_state.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index a9a599fc6d8..1ac2cb42e10 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -580,7 +580,7 @@ "description": "gallium: fix missing bit field in p_state.h", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "3dc6da1ac1f5be2d6421940739b88f7e8d36cdf9" }, diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index fbf463618da..78fbd80960e 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -111,7 +111,7 @@ struct pipe_rasterizer_state unsigned point_tri_clip:1; /** large points clipped as tris or points */ unsigned point_size_per_vertex:1; /**< size computed in vertex shader */ unsigned multisample:1; /* XXX maybe more ms state in future */ - unsigned no_ms_sample_mask_out; + unsigned no_ms_sample_mask_out:1; unsigned force_persample_interp:1; unsigned line_smooth:1; unsigned line_stipple_enable:1; |