r300: don't use smooth line if not requested

Makes these tests passing:
dEQP-GLES2.functional.rasterization.interpolation.basic.line_loop_wide,UnexpectedPass
dEQP-GLES2.functional.rasterization.interpolation.basic.lines_wide,UnexpectedPass
dEQP-GLES2.functional.rasterization.interpolation.projected.line_loop_wide,UnexpectedPass
dEQP-GLES2.functional.rasterization.interpolation.projected.line_strip_wide,UnexpectedPass
dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide,UnexpectedPass
dEQP-GLES2.functional.rasterization.primitives.line_loop,UnexpectedPass
dEQP-GLES2.functional.rasterization.primitives.line_strip,UnexpectedPass
dEQP-GLES2.functional.rasterization.primitives.lines,UnexpectedPass
dEQP-GLES2.functional.rasterization.primitives.lines_wide,UnexpectedPass

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18979>
This commit is contained in:
Filip Gawin
2022-10-06 00:59:50 +02:00
committed by Marge Bot
parent 98944b327b
commit 4e7b9aaa06
2 changed files with 1 additions and 13 deletions

View File

@@ -25,19 +25,7 @@ dEQP-GLES2.functional.polygon_offset.fixed16_displacement_with_units,Fail
dEQP-GLES2.functional.polygon_offset.fixed16_render_with_units,Fail
dEQP-GLES2.functional.polygon_offset.fixed16_factor_1_slope,Fail
# Minor errors around the edges
dEQP-GLES2.functional.rasterization.interpolation.basic.lines_wide,Fail
dEQP-GLES2.functional.rasterization.interpolation.basic.line_strip_wide,Fail
dEQP-GLES2.functional.rasterization.interpolation.basic.line_loop_wide,Fail
dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide,Fail
dEQP-GLES2.functional.rasterization.interpolation.projected.line_strip_wide,Fail
dEQP-GLES2.functional.rasterization.interpolation.projected.line_loop_wide,Fail
# "Invalid line width at (119, 179) - (119, 180). Detected width of 2, expected 1"
dEQP-GLES2.functional.rasterization.primitives.lines,Fail
dEQP-GLES2.functional.rasterization.primitives.line_strip,Fail
dEQP-GLES2.functional.rasterization.primitives.line_loop,Fail
dEQP-GLES2.functional.rasterization.primitives.lines_wide,Fail
dEQP-GLES2.functional.rasterization.primitives.line_strip_wide,Fail,Fail
dEQP-GLES2.functional.rasterization.primitives.line_loop_wide,Fail

View File

@@ -1219,7 +1219,7 @@ static void* r300_create_rs_state(struct pipe_context* pipe,
/* Line control. */
line_control = pack_float_16_6x(state->line_width) |
R300_GA_LINE_CNTL_END_TYPE_COMP;
(state->line_smooth ? R300_GA_LINE_CNTL_END_TYPE_COMP : R300_GA_LINE_CNTL_END_TYPE_SQR);
/* Enable polygon mode */
polygon_mode = 0;