Module: Mesa
Branch: master
Commit: ccb50f8ad339970e57c9e0623eef581b7de66ae6
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ccb50f8ad339970e57c9e0623eef581b7de66ae6

Author: Erik Faye-Lund <[email protected]>
Date:   Tue Mar 23 17:19:04 2021 +0100

zink: emit all interpolation modes

It's not just flat-shading that matters in the case of fragment outputs.
Let's play nicely and emit any interpolation mode instead.

Reviewed-By: Mike Blumenkrantz <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9775>

---

 src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt  | 1 -
 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

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 0c50625f6a8..22fc1844d8a 100644
--- a/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/deqp-zink-lvp-fails.txt
@@ -182,7 +182,6 @@ 
dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.sampler2dshadow_
 
dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.sampler2d_vec3_fixed_vertex,Fail
 
dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.sampler2d_vec4_fixed_vertex,Fail
 
dEQP-GLES3.functional.shaders.texture_functions.textureprojgrad.sampler3d_fixed_vertex,Fail
-KHR-GL32.glsl_noperspective.functionaltest,Fail
 KHR-GL32.gpu_shader5_gl.float_encoding,Fail
 KHR-GL32.packed_depth_stencil.blit.depth24_stencil8,Fail
 KHR-GL32.packed_depth_stencil.blit.depth32f_stencil8,Fail
diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c 
b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index 4fa3c7709b8..45be59b0d73 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -536,8 +536,7 @@ emit_input(struct ntv_context *ctx, struct nir_variable 
*var)
    if (var->data.patch)
       spirv_builder_emit_decoration(&ctx->builder, var_id, SpvDecorationPatch);
 
-   if (var->data.interpolation == INTERP_MODE_FLAT)
-      spirv_builder_emit_decoration(&ctx->builder, var_id, SpvDecorationFlat);
+   emit_interpolation(ctx, var_id, var->data.interpolation);
 
    _mesa_hash_table_insert(ctx->vars, var, (void *)(intptr_t)var_id);
 

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to