Module: Mesa Branch: staging/20.3 Commit: 7e90c4d148e5a9f7c10cbaa60828d309f30b3a8a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e90c4d148e5a9f7c10cbaa60828d309f30b3a8a
Author: Dave Airlie <[email protected]> Date: Tue Nov 10 07:28:53 2020 +1000 llvmpipe: fix multisample point rendering. Fixes one case in dEQP-VK.rasterization.primitives_multisample_4_bit.no_stipple.points Cc: "20.3" <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7705> (cherry picked from commit d932720ff7dd8fafbb200d9f91c3956d5f0e775e) --- .pick_status.json | 2 +- src/gallium/drivers/llvmpipe/lp_setup_point.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 791f476a67c..a0bc9de00c4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -616,7 +616,7 @@ "description": "llvmpipe: fix multisample point rendering.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/llvmpipe/lp_setup_point.c b/src/gallium/drivers/llvmpipe/lp_setup_point.c index fde1fafaf29..a33d31de205 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup_point.c +++ b/src/gallium/drivers/llvmpipe/lp_setup_point.c @@ -350,7 +350,7 @@ try_setup_point( struct lp_setup_context *setup, * slightly different rounding. */ int adj = (setup->bottom_edge_rule != 0) ? 1 : 0; - + float pixel_offset = setup->multisample ? 0.0 : setup->pixel_offset; struct lp_scene *scene = setup->scene; struct lp_rast_triangle *point; unsigned bytes; @@ -385,8 +385,8 @@ try_setup_point( struct lp_setup_context *setup, */ fixed_width = MAX2(FIXED_ONE, subpixel_snap(size)); - x0 = subpixel_snap(v0[0][0] - setup->pixel_offset) - fixed_width/2; - y0 = subpixel_snap(v0[0][1] - setup->pixel_offset) - fixed_width/2; + x0 = subpixel_snap(v0[0][0] - pixel_offset) - fixed_width/2; + y0 = subpixel_snap(v0[0][1] - pixel_offset) - fixed_width/2; bbox.x0 = (x0 + (FIXED_ONE-1)) >> FIXED_ORDER; bbox.x1 = (x0 + fixed_width + (FIXED_ONE-1)) >> FIXED_ORDER; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
