From 7da15bdd2d05cc252b28cf385bf2cf2b31aa576b Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Wed, 11 Sep 2019 13:42:43 -0400 Subject: [PATCH] etnaviv: nir: fix gl_FrontFacing Only invert front facing when glFrontFace is GL_CW. Fixes following deqp test: dEQP-GLES2.functional.shaders.builtin_variable.frontfacing Signed-off-by: Jonathan Marek Reviewed-by: Christian Gmeiner --- src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 3 +++ src/gallium/drivers/etnaviv/etnaviv_context.c | 5 ++++- src/gallium/drivers/etnaviv/etnaviv_shader.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index c2bfec14ed2..a00f89b4e21 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -98,6 +98,9 @@ etna_lower_io(nir_shader *shader, struct etna_shader_variant *v) switch (intr->intrinsic) { case nir_intrinsic_load_front_face: { + if (!v->key.front_ccw) + break; + /* front face inverted (run after int_to_float, so invert as float) */ b.cursor = nir_after_instr(instr); diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.c b/src/gallium/drivers/etnaviv/etnaviv_context.c index b3ced5ea246..82254f9c1c1 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_context.c +++ b/src/gallium/drivers/etnaviv/etnaviv_context.c @@ -214,7 +214,10 @@ etna_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) } ctx->dirty |= ETNA_DIRTY_INDEX_BUFFER; - struct etna_shader_key key = {}; + struct etna_shader_key key = { + .front_ccw = ctx->rasterizer->front_ccw, + }; + if (pfb->cbufs[0]) key.frag_rb_swap = !!translate_rs_format_rb_swap(pfb->cbufs[0]->format); diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.h b/src/gallium/drivers/etnaviv/etnaviv_shader.h index 3c5b6e65d94..528603a55a9 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_shader.h +++ b/src/gallium/drivers/etnaviv/etnaviv_shader.h @@ -43,6 +43,8 @@ struct etna_shader_key /* do we need to swap rb in frag color? */ unsigned frag_rb_swap : 1; + /* do we need to invert front facing value? */ + unsigned front_ccw : 1; }; uint32_t global; }; -- 2.30.2