Mesa (main): lavapipe: always set point_tri_clip

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 67bbe79d35d111506744b4f0330a211bc8300445
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=67bbe79d35d111506744b4f0330a211bc8300445

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Jun 27 13:56:23 2022 -0400

lavapipe: always set point_tri_clip

this invokes GLES-compatible point clipping, which is more consistent
with vulkan expectations and fixes a number of zink tests

Acked-by: Emma Anholt <emma at anholt.net>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17259>

---

 src/gallium/drivers/zink/ci/zink-lvp-fails.txt | 9 +++------
 src/gallium/frontends/lavapipe/lvp_execute.c   | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
index 003d17281ad..27eef4dbe1a 100644
--- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt
@@ -106,6 +106,9 @@ dEQP-GL45-ES31.functional.primitive_bounding_box.wide_points.tessellation_set_pe
 dEQP-GL45-ES31.functional.primitive_bounding_box.wide_points.tessellation_set_per_primitive.vertex_tessellation_fragment.fbo,Fail
 
 
+# #6745
+spec at glsl-1.50@gs-max-output,Fail
+
 # #6115
 spec at arb_tessellation_shader@execution at variable-indexing@tes-both-input-array-float-index-rd,Crash
 spec at arb_tessellation_shader@execution at variable-indexing@tes-both-input-array-vec2-index-rd,Crash
@@ -131,14 +134,8 @@ spec at egl_chromium_sync_control@conformance at eglGetSyncValuesCHROMIUM_ust_test,Fai
 spec at ext_framebuffer_blit@fbo-sys-blit,Fail
 spec at ext_framebuffer_blit@fbo-sys-sub-blit,Fail
 
-dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail
-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail
-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
 dEQP-GLES3.functional.clipping.line.wide_line_clip_viewport_center,Fail
 dEQP-GLES3.functional.clipping.line.wide_line_clip_viewport_corner,Fail
-dEQP-GLES3.functional.clipping.point.wide_point_clip,Fail
-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.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
diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c
index f9358fc0755..3c2aadc2f2a 100644
--- a/src/gallium/frontends/lavapipe/lvp_execute.c
+++ b/src/gallium/frontends/lavapipe/lvp_execute.c
@@ -4013,6 +4013,7 @@ VkResult lvp_execute_cmds(struct lvp_device *device,
    state->dsa_dirty = true;
    state->rs_dirty = true;
    state->vp_dirty = true;
+   state->rs_state.point_tri_clip = true;
    for (enum pipe_shader_type s = PIPE_SHADER_VERTEX; s < PIPE_SHADER_TYPES; s++) {
       for (unsigned i = 0; i < PIPE_MAX_SAMPLERS; i++)
          state->cso_ss_ptr[s][i] = &state->ss[s][i];