From: Karol Herbst Date: Wed, 15 Apr 2020 20:24:35 +0000 (+0200) Subject: Revert "nvc0: fix line width on GM20x+" X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2d489f76f48095799392a915dcedc074bbb5e52a;p=mesa.git 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 Reviewed-by: Ilia Mirkin Part-of: --- diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c index d53a6cb2a26..5cb07609dae 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);