nir: Support deref instructions in lower_drawpixels

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c
index fcdc0bc4b412baebfe090015a5b6d514401d4944..05131affdb29282aebe2c037950256b16b221a34 100644 (file)
--- a/src/compiler/nir/nir_lower_drawpixels.c
+++ b/src/compiler/nir/nir_lower_drawpixels.c
@@ -212,7 +212,20 @@ lower_drawpixels_block(lower_drawpixels_state *state, nir_block *block)
    nir_foreach_instr_safe(instr, block) {
       if (instr->type == nir_instr_type_intrinsic) {
          nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
-         if (intr->intrinsic == nir_intrinsic_load_var) {
+         if (intr->intrinsic == nir_intrinsic_load_deref) {
+            nir_deref_instr *deref = nir_src_as_deref(intr->src[0]);
+            nir_variable *var = nir_deref_instr_get_variable(deref);
+
+            if (var->data.location == VARYING_SLOT_COL0) {
+               /* gl_Color should not have array/struct derefs: */
+               assert(deref->deref_type == nir_deref_type_var);
+               lower_color(state, intr);
+            } else if (var->data.location == VARYING_SLOT_TEX0) {
+               /* gl_TexCoord should not have array/struct derefs: */
+               assert(deref->deref_type == nir_deref_type_var);
+               lower_texcoord(state, intr);
+            }
+         } else if (intr->intrinsic == nir_intrinsic_load_var) {
             nir_deref_var *dvar = intr->variables[0];
             nir_variable *var = dvar->var;
 
@@ -253,11 +266,6 @@ nir_lower_drawpixels(nir_shader *shader,
       .shader = shader,
    };
 
-   /* note that this pass already assumes texture/sampler derefs are already
-    * lowered to index
-    */
-   nir_assert_lowered_derefs(shader, nir_lower_load_store_derefs);
-
    assert(shader->info.stage == MESA_SHADER_FRAGMENT);
 
    nir_foreach_function(function, shader) {