From 98812f893bd1fa66cf3e0bea2ec84ec773cc86b1 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Thu, 20 May 2021 18:32:20 +0200 Subject: [PATCH] zink: fix provoking-vertex cap for quads The way we've doing this currently preserves provoking vertex for quads, so let's report that to the state-tracker. This fixes a couple of piglits. Reviewed-By: Mike Blumenkrantz Part-of: --- src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt | 2 -- src/gallium/drivers/zink/zink_screen.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt index f6cd5fc05a8..a5cbf722c2e 100644 --- a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt @@ -35,7 +35,6 @@ spec@!opengl 1.0@gl-1.0-edgeflag,Fail spec@!opengl 1.0@gl-1.0-edgeflag-quads,Fail spec@!opengl 1.0@gl-1.0-no-op-paths,Fail spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail -spec@!opengl 1.1@clipflat,Fail spec@!opengl 1.1@linestipple,Fail spec@!opengl 1.1@polygon-mode,Fail spec@!opengl 1.1@polygon-mode-facing,Fail @@ -72,7 +71,6 @@ spec@arb_point_parameters@arb_point_parameters-point-attenuation,Fail spec@arb_point_sprite@arb_point_sprite-checkerboard,Fail spec@arb_point_sprite@arb_point_sprite-mipmap,Fail spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex,Fail -spec@arb_provoking_vertex@arb-provoking-vertex-render,Fail spec@arb_sample_shading@ignore-centroid-qualifier 2,Fail spec@arb_sample_shading@ignore-centroid-qualifier 4,Fail spec@arb_sample_shading@interpolate-at-sample-position 2,Fail diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 27495265b8c..26c01baa2a2 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -255,6 +255,9 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_PACKED_UNIFORMS: return 1; + case PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION: + return screen->info.have_EXT_provoking_vertex; + case PIPE_CAP_TEXTURE_MIRROR_CLAMP_TO_EDGE: return screen->info.have_KHR_sampler_mirror_clamp_to_edge;