Mesa (staging/21.1): llvmpipe: fix edge-rule logic for lines
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jun 16 06:40:59 UTC 2021
Module: Mesa
Branch: staging/21.1
Commit: 14e94e44581f651b0529a0602d11627b19965baa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=14e94e44581f651b0529a0602d11627b19965baa
Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date: Tue Jun 8 13:20:59 2021 +0200
llvmpipe: fix edge-rule logic for lines
In 2737abb44ef, the handling of pixel-offsets and edge rules were
untangled, but one case was missed.
This fixes the following dEQP test-cases on VirGL + LLVMpipe
- dEQP-GLES2.functional.draw.random.10
- dEQP-GLES2.functional.draw.random.42
- dEQP-GLES3.functional.draw.random.105
- dEQP-GLES3.functional.draw.random.114
- dEQP-GLES3.functional.draw.random.135
- dEQP-GLES3.functional.draw.random.144
- dEQP-GLES3.functional.draw.random.155
- dEQP-GLES3.functional.draw.random.174
- dEQP-GLES3.functional.draw.random.206
- dEQP-GLES3.functional.draw.random.31
- dEQP-GLES3.functional.draw.random.43
- dEQP-GLES3.functional.draw.random.84
- dEQP-GLES31.functional.draw_indirect.random.20
...as well as these on Zink + Lavapipe:
- spec at nv_primitive_restart@primitive-restart-disable_vbo
- spec at nv_primitive_restart@primitive-restart-vbo_combined_vertex_and_index
- spec at nv_primitive_restart@primitive-restart-vbo_index_only
- spec at nv_primitive_restart@primitive-restart-vbo_separate_vertex_and_index
- spec at nv_primitive_restart@primitive-restart-vbo_vertex_only
Fixes: 2737abb44ef ("gallium: Replace gl_rasterization_rules with lower_left_origin and half_pixel_center.")
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11183>
(cherry picked from commit 2812f030f19fc2e0cdaa423b0cc2a04db984ac27)
---
.pick_status.json | 6 +++---
src/gallium/drivers/llvmpipe/lp_setup_line.c | 2 +-
src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt | 13 -------------
src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt | 13 -------------
src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt | 4 ----
5 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 9535232b753..0dfffbe4a7e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2254,7 +2254,7 @@
"description": "llvmpipe: fix edge-rule logic for lines",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "2737abb44efebfa10ac84b183c20fc5818d1514e"
},
@@ -3019,7 +3019,7 @@
"description": "panfrost: Allocate XFB buffers per-instance",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
@@ -3145,7 +3145,7 @@
"description": "pan/mdg: Fix incorrect rewrite in Midgard scheduler",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_line.c b/src/gallium/drivers/llvmpipe/lp_setup_line.c
index 62efa63bb57..0535138df25 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_line.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_line.c
@@ -671,7 +671,7 @@ try_setup_line( struct lp_setup_context *setup,
plane[i].c++;
}
else if (plane[i].dcdx == 0) {
- if (pixel_offset == 0) {
+ if (setup->bottom_edge_rule == 0) {
/* correct for top-left fill convention:
*/
if (plane[i].dcdy > 0) plane[i].c++;
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
index ada53e6e00a..aa9a5487803 100644
--- a/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
@@ -5,8 +5,6 @@ dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail
dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z,Fail
-dEQP-GLES2.functional.draw.random.10,Fail
-dEQP-GLES2.functional.draw.random.42,Fail
dEQP-GLES2.functional.polygon_offset.default_displacement_with_units,Fail
dEQP-GLES2.functional.polygon_offset.fixed16_displacement_with_units,Fail
dEQP-GLES2.functional.rasterization.interpolation.basic.line_loop_wide,Fail
@@ -22,16 +20,6 @@ dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center,Fail
dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner,Fail
dEQP-GLES3.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
dEQP-GLES3.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z,Fail
-dEQP-GLES3.functional.draw.random.105,Fail
-dEQP-GLES3.functional.draw.random.114,Fail
-dEQP-GLES3.functional.draw.random.135,Fail
-dEQP-GLES3.functional.draw.random.144,Fail
-dEQP-GLES3.functional.draw.random.155,Fail
-dEQP-GLES3.functional.draw.random.174,Fail
-dEQP-GLES3.functional.draw.random.206,Fail
-dEQP-GLES3.functional.draw.random.31,Fail
-dEQP-GLES3.functional.draw.random.43,Fail
-dEQP-GLES3.functional.draw.random.84,Fail
dEQP-GLES3.functional.fbo.blit.default_framebuffer.rgb8_linear_scale_blit_from_default,Fail
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag,Fail
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_dst_x,Fail
@@ -522,7 +510,6 @@ dEQP-GLES31.functional.draw_indirect.compute_interop.separate.drawelements_compu
dEQP-GLES31.functional.draw_indirect.compute_interop.separate.drawelements_compute_data_and_indices,Fail
dEQP-GLES31.functional.draw_indirect.compute_interop.separate.drawelements_compute_data,Fail
dEQP-GLES31.functional.draw_indirect.compute_interop.separate.drawelements_compute_indices,Fail
-dEQP-GLES31.functional.draw_indirect.random.20,Fail
dEQP-GLES31.functional.image_load_store.2d_array.atomic.exchange_r32f_result,Crash
dEQP-GLES31.functional.image_load_store.2d_array.atomic.exchange_r32f_return_value,Crash
dEQP-GLES31.functional.image_load_store.2d_array.format_reinterpret.r32f_r32i,Fail
diff --git a/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
index 51b0d920c0c..5191dbb78a0 100644
--- a/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
@@ -5,8 +5,6 @@ dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail
dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z,Fail
-dEQP-GLES2.functional.draw.random.10,Fail
-dEQP-GLES2.functional.draw.random.42,Fail
dEQP-GLES2.functional.fbo.render.color_clear.rbo_rgba4,Fail
dEQP-GLES2.functional.fbo.render.color_clear.rbo_rgba4_depth_component16,Fail
dEQP-GLES2.functional.fbo.render.color_clear.rbo_rgba4_stencil_index8,Fail
@@ -37,16 +35,6 @@ dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center,Fail
dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner,Fail
dEQP-GLES3.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
dEQP-GLES3.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z,Fail
-dEQP-GLES3.functional.draw.random.105,Fail
-dEQP-GLES3.functional.draw.random.114,Fail
-dEQP-GLES3.functional.draw.random.135,Fail
-dEQP-GLES3.functional.draw.random.144,Fail
-dEQP-GLES3.functional.draw.random.155,Fail
-dEQP-GLES3.functional.draw.random.174,Fail
-dEQP-GLES3.functional.draw.random.206,Fail
-dEQP-GLES3.functional.draw.random.31,Fail
-dEQP-GLES3.functional.draw.random.43,Fail
-dEQP-GLES3.functional.draw.random.84,Fail
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag,Fail
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_dst_x,Fail
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag_reverse_src_dst_x,Fail
@@ -86,7 +74,6 @@ dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide,Fail
dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.8,Fail
dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.4,Fail
dEQP-GLES31.functional.draw_buffers_indexed.random.max_required_draw_buffers.9,Fail
-dEQP-GLES31.functional.draw_indirect.random.20,Fail
KHR-GL30.transform_feedback.api_errors_test,Fail
KHR-GL30.transform_feedback.capture_vertex_interleaved_test,Fail
KHR-GL30.transform_feedback.capture_vertex_separate_test,Fail
diff --git a/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt
index 529394183e6..f1e384b62d9 100644
--- a/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt
@@ -4,14 +4,10 @@ dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_pos_x_and_neg_y_neg_z_and_pos_y_pos_z,Fail
dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z,Fail
-dEQP-GLES2.functional.draw.random.10,Fail
-dEQP-GLES2.functional.draw.random.42,Fail
dEQP-GLES2.functional.polygon_offset.default_displacement_with_units,Fail
dEQP-GLES2.functional.polygon_offset.fixed16_displacement_with_units,Fail
dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center,Fail
dEQP-GLES3.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
-dEQP-GLES3.functional.draw.random.135,Fail
-dEQP-GLES3.functional.draw.random.31,Fail
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_mag,Fail
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_x,Fail
dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail
More information about the mesa-commit
mailing list