diff options
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir_lower_drawpixels.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c index 05131affdb2..f8fecebe6d2 100644 --- a/src/compiler/nir/nir_lower_drawpixels.c +++ b/src/compiler/nir/nir_lower_drawpixels.c @@ -225,19 +225,6 @@ lower_drawpixels_block(lower_drawpixels_state *state, nir_block *block) 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; - - if (var->data.location == VARYING_SLOT_COL0) { - /* gl_Color should not have array/struct derefs: */ - assert(dvar->deref.child == NULL); - lower_color(state, intr); - } else if (var->data.location == VARYING_SLOT_TEX0) { - /* gl_TexCoord should not have array/struct derefs: */ - assert(dvar->deref.child == NULL); - lower_texcoord(state, intr); - } } } } @@ -266,6 +253,11 @@ nir_lower_drawpixels(nir_shader *shader, .shader = shader, }; + /* note that this pass already assumes texture/sampler derefs are already + * lowered to index + */ + nir_assert_unlowered_derefs(shader, nir_lower_load_store_derefs); + assert(shader->info.stage == MESA_SHADER_FRAGMENT); nir_foreach_function(function, shader) { |