Module: Mesa Branch: staging/20.0 Commit: ded9c5c4900d1c12e136ed60345e804d1e24a1b8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ded9c5c4900d1c12e136ed60345e804d1e24a1b8
Author: Karol Herbst <[email protected]> Date: Wed Apr 15 22:24:35 2020 +0200 Revert "nvc0: fix line width on GM20x+" This reverts commit a0e57432b76c32f2109dab0ad3df0ba03967441c. It's unclear what caused the test to fail back then. Now it's seems to be reversed. I tested with a close enough piglit and mesa branch and wasn't able to reproduce the same test result I've got in some older piglit runs. Fixes: dEQP-GLES2.functional.rasterization.primitives.lines_wide dEQP-GLES2.functional.rasterization.primitives.line_strip_wide dEQP-GLES2.functional.rasterization.primitives.line_loop_wide dEQP-GLES2.functional.rasterization.limits.points dEQP-GLES2.functional.clipping.line.wide_line_z_clip dEQP-GLES2.functional.clipping.line.wide_line_z_clip_viewport_center dEQP-GLES2.functional.clipping.line.wide_line_z_clip_viewport_corner dEQP-GLES2.functional.clipping.line.wide_line_clip dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner dEQP-GLES2.functional.clipping.line.wide_line_attrib_clip dEQP-GLES2.functional.polygon_offset.default_result_depth_clamp dEQP-GLES2.functional.polygon_offset.default_factor_1_slope dEQP-GLES2.functional.polygon_offset.fixed16_result_depth_clamp dEQP-GLES2.functional.polygon_offset.fixed16_factor_1_slope Signed-off-by: Karol Herbst <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4575> (cherry picked from commit 2d489f76f48095799392a915dcedc074bbb5e52a) --- .pick_status.json | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index baf3ea1ba20..86dcc07d10a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2083,7 +2083,7 @@ "description": "Revert \"nvc0: fix line width on GM20x+\"", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "a0e57432b76c32f2109dab0ad3df0ba03967441c" }, diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c index 49546e5de68..8f3db46798a 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c @@ -235,10 +235,7 @@ nvc0_rasterizer_state_create(struct pipe_context *pipe, SB_IMMED_3D(so, MULTISAMPLE_ENABLE, cso->multisample); SB_IMMED_3D(so, LINE_SMOOTH_ENABLE, cso->line_smooth); - /* On GM20x+, LINE_WIDTH_SMOOTH controls both aliased and smooth - * rendering and LINE_WIDTH_ALIASED seems to be ignored - */ - if (cso->line_smooth || cso->multisample || class_3d >= GM200_3D_CLASS) + if (cso->line_smooth || cso->multisample) SB_BEGIN_3D(so, LINE_WIDTH_SMOOTH, 1); else SB_BEGIN_3D(so, LINE_WIDTH_ALIASED, 1); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
