KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jason Ekstrand 2018-04-02 15:57:25 -07:00
parent 932c6577a0
commit 775ef13384
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/compiler/nir/nir_lower_drawpixels.c
View File

@ -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) {