OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: promote intrinsic_get_var() to helper

Browse Source 
Useful in a few other places.. let's not copy-pasta

Signed-off-by: Rob Clark <robdclark@gmail.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:
Rob Clark
2018-04-04 20:40:33 -04:00
committed by Jason Ekstrand
parent 5a02ffb733
commit 95683bdce3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/nir/nir.h
View File

@@ -1111,6 +1111,12 @@ typedef struct {
nir_src src[]; nir_src src[];
} nir_intrinsic_instr; } nir_intrinsic_instr;
static inline nir_variable *
nir_intrinsic_get_var(nir_intrinsic_instr *intrin, unsigned i)
{
return nir_deref_instr_get_variable(nir_src_as_deref(intrin->src[i]));
}
/** /**
* \name NIR intrinsics semantic flags * \name NIR intrinsics semantic flags
* *

14
src/compiler/nir/nir_propagate_invariant.c
View File

@@ -74,12 +74,6 @@ var_is_invariant(nir_variable *var, struct set * invariants)
return var->data.invariant || _mesa_set_search(invariants, var); return var->data.invariant || _mesa_set_search(invariants, var);
} }
static nir_variable *
intrinsic_get_var(nir_intrinsic_instr *intrin, unsigned i)
{
return nir_deref_instr_get_variable(nir_src_as_deref(intrin->src[i]));
}
static void static void
propagate_invariant_instr(nir_instr *instr, struct set *invariants) propagate_invariant_instr(nir_instr *instr, struct set *invariants)
{ {
@@ -106,17 +100,17 @@ propagate_invariant_instr(nir_instr *instr, struct set *invariants)
switch (intrin->intrinsic) { switch (intrin->intrinsic) {
case nir_intrinsic_copy_deref: case nir_intrinsic_copy_deref:
/* If the destination is invariant then so is the source */ /* If the destination is invariant then so is the source */
if (var_is_invariant(intrinsic_get_var(intrin, 0), invariants)) if (var_is_invariant(nir_intrinsic_get_var(intrin, 0), invariants))
add_var(intrinsic_get_var(intrin, 1), invariants); add_var(nir_intrinsic_get_var(intrin, 1), invariants);
break; break;
case nir_intrinsic_load_deref: case nir_intrinsic_load_deref:
if (dest_is_invariant(&intrin->dest, invariants)) if (dest_is_invariant(&intrin->dest, invariants))
add_var(intrinsic_get_var(intrin, 0), invariants); add_var(nir_intrinsic_get_var(intrin, 0), invariants);
break; break;
case nir_intrinsic_store_deref: case nir_intrinsic_store_deref:
if (var_is_invariant(intrinsic_get_var(intrin, 0), invariants)) if (var_is_invariant(nir_intrinsic_get_var(intrin, 0), invariants))
add_src(&intrin->src[1], invariants); add_src(&intrin->src[1], invariants);
break; break;