gallivm/nir: align store_var param order with load_var

This was ugly so align load/store to have mostly the same
parameter ordering

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3841>
This commit is contained in:
Dave Airlie 2020-02-17 16:42:25 +10:00
parent 7898e37fb4
commit 87359d68a9
3 changed files with 7 additions and 5 deletions

View file

@ -977,7 +977,7 @@ visit_store_var(struct lp_build_nir_context *bld_base,
if (var)
get_deref_offset(bld_base, deref, false, NULL, NULL,
&const_index, &indir_index);
bld_base->store_var(bld_base, mode, bit_size, instr->num_components, writemask, const_index, var, src);
bld_base->store_var(bld_base, mode, instr->num_components, bit_size, var, writemask, const_index, src);
}
static void visit_load_ubo(struct lp_build_nir_context *bld_base,

View file

@ -124,11 +124,12 @@ struct lp_build_nir_context
LLVMValueRef result[NIR_MAX_VEC_COMPONENTS]);
void (*store_var)(struct lp_build_nir_context *bld_base,
nir_variable_mode deref_mode,
unsigned bit_size,
unsigned num_components,
unsigned bit_size,
nir_variable *var,
unsigned writemask,
unsigned const_index,
nir_variable *var, LLVMValueRef dst);
LLVMValueRef dst);
LLVMValueRef (*load_reg)(struct lp_build_nir_context *bld_base,
struct lp_build_context *reg_bld,

View file

@ -394,11 +394,12 @@ static void emit_store_chan(struct lp_build_nir_context *bld_base,
static void emit_store_var(struct lp_build_nir_context *bld_base,
nir_variable_mode deref_mode,
unsigned bit_size,
unsigned num_components,
unsigned bit_size,
nir_variable *var,
unsigned writemask,
unsigned const_index,
nir_variable *var, LLVMValueRef dst)
LLVMValueRef dst)
{
struct lp_build_nir_soa_context *bld = (struct lp_build_nir_soa_context *)bld_base;
LLVMBuilderRef builder = bld->bld_base.base.gallivm->builder;