From f812cc0fe62565675555a93dfc20e5abf0dd60ce Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Fri, 27 May 2022 17:19:23 -0700 Subject: [PATCH] nir: Consider PNTC to be a varying MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 3528dcdf ("nir: add nir_io_semantics::no_varying, no_sysval_output, and helpers") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6091 Reviewed-by: Marek Olšák Part-of: --- src/compiler/nir/nir.c | 1 + src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index c6a235e103d..be5bbfc993a 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -3467,6 +3467,7 @@ nir_slot_is_varying(gl_varying_slot slot) slot == VARYING_SLOT_BFC1 || slot == VARYING_SLOT_FOGC || (slot >= VARYING_SLOT_TEX0 && slot <= VARYING_SLOT_TEX7) || + slot == VARYING_SLOT_PNTC || slot == VARYING_SLOT_CLIP_DIST0 || slot == VARYING_SLOT_CLIP_DIST1 || slot == VARYING_SLOT_CULL_DIST0 || diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt index 0bed442a17a..57de9ab9a42 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt @@ -32,7 +32,6 @@ shaders/activeprogram-get: skip shaders/createshaderprogram-attached-shaders: skip shaders/createshaderprogram-bad-type: skip shaders/glsl-bug-110796: skip -shaders/glsl-fs-pointcoord: crash shaders/glsl-max-varyings: fail shaders/glsl-max-varyings >max_varying_components: fail shaders/glsl-uniform-interstage-limits/1 vs, 520 fs: fail @@ -217,7 +216,6 @@ spec/!opengl 3.2/layered-rendering/gl-layer-cube-map: fail spec/!opengl 3.2/layered-rendering/gl-layer-render: fail spec/!opengl 3.2/layered-rendering/gl-layer-render-clipped: fail spec/!opengl 3.2/layered-rendering/gl-layer-render-storage: fail -spec/!opengl 3.2/pointsprite-origin: crash spec/!opengl 4.2/gl-max-vertex-attrib-stride: skip spec/!opengl 4.3/get_glsl_version: skip spec/!opengl 4.5/compare-framebuffer-parameter-with-get: skip @@ -458,7 +456,6 @@ spec/arb_framebuffer_no_attachments/arb_framebuffer_no_attachments-query/ms2: sk spec/arb_framebuffer_no_attachments/arb_framebuffer_no_attachments-query/ms4: skip spec/arb_framebuffer_no_attachments/arb_framebuffer_no_attachments-query/ms6: skip spec/arb_framebuffer_no_attachments/arb_framebuffer_no_attachments-query/ms8: skip -spec/arb_framebuffer_object/fbo-gl_pointcoord: crash spec/arb_framebuffer_srgb/arb_framebuffer_srgb-srgb_conformance: fail spec/arb_geometry_shader4/arb_geometry_shader4-ignore-adjacent-vertices gl_line_strip_adjacency: skip spec/arb_geometry_shader4/arb_geometry_shader4-ignore-adjacent-vertices gl_lines_adjacency: skip @@ -3524,9 +3521,9 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 17847 + pass: 17850 fail: 2039 - crash: 15 + crash: 12 skip: 1450 timeout: 0 warn: 10