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

gallivm: move lp_build_nir_aos_context declaration, etc

Browse Source 
Move the lp_build_nir_aos_context struct declaration and
lp_nir_aos_context() cast wrapper from lp_bld_nir.h to
lp_bld_nir_aos.c and use the cast wrapper in more places.

Signed-off-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18213>
This commit is contained in:
Brian Paul
2022-07-15 22:04:34 -06:00
committed by Marge Bot
parent 2967cc25ea
commit 9b86745d69
2 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/gallivm/lp_bld_nir.h
+1 -31
View File
@@ -285,30 +285,6 @@ struct lp_build_nir_soa_context
unsigned gs_vertex_streams;
};
struct lp_build_nir_aos_context
{
struct lp_build_nir_context bld_base;
/* Builder for integer masks and indices */
struct lp_build_context int_bld;
/*
* AoS swizzle used:
* - swizzles[0] = red index
* - swizzles[1] = green index
* - swizzles[2] = blue index
* - swizzles[3] = alpha index
*/
unsigned char swizzles[4];
unsigned char inv_swizzles[4];
LLVMValueRef consts_ptr;
const LLVMValueRef *inputs;
LLVMValueRef *outputs;
const struct lp_build_sampler_aos *sampler;
};
bool
lp_build_nir_llvm(struct lp_build_nir_context *bld_base,
@@ -382,15 +358,9 @@ get_int_bld(struct lp_build_nir_context *bld_base,
}
static inline struct lp_build_nir_aos_context *
lp_nir_aos_context(struct lp_build_nir_context *bld_base)
{
return (struct lp_build_nir_aos_context *) bld_base;
}
LLVMValueRef
lp_nir_aos_conv_const(struct gallivm_state *gallivm,
LLVMValueRef constval, int nc);
#endif
src/gallium/auxiliary/gallivm/lp_bld_nir_aos.c
+37 -10
View File
@@ -33,6 +33,38 @@
#include "util/u_math.h"
struct lp_build_nir_aos_context
{
struct lp_build_nir_context bld_base;
/* Builder for integer masks and indices */
struct lp_build_context int_bld;
/*
* AoS swizzle used:
* - swizzles[0] = red index
* - swizzles[1] = green index
* - swizzles[2] = blue index
* - swizzles[3] = alpha index
*/
unsigned char swizzles[4];
unsigned char inv_swizzles[4];
LLVMValueRef consts_ptr;
const LLVMValueRef *inputs;
LLVMValueRef *outputs;
const struct lp_build_sampler_aos *sampler;
};
static inline struct lp_build_nir_aos_context *
lp_nir_aos_context(struct lp_build_nir_context *bld_base)
{
return (struct lp_build_nir_aos_context *) bld_base;
}
static LLVMValueRef
swizzle_aos(struct lp_build_nir_context *bld_base,
LLVMValueRef a,
@@ -92,8 +124,7 @@ static void
init_var_slots(struct lp_build_nir_context *bld_base,
nir_variable *var)
{
struct lp_build_nir_aos_context *bld =
(struct lp_build_nir_aos_context *)bld_base;
struct lp_build_nir_aos_context *bld = lp_nir_aos_context(bld_base);
if (!bld->outputs)
return;
@@ -127,8 +158,7 @@ emit_load_var(struct lp_build_nir_context *bld_base,
LLVMValueRef indir_index,
LLVMValueRef result[NIR_MAX_VEC_COMPONENTS])
{
struct lp_build_nir_aos_context *bld =
(struct lp_build_nir_aos_context *)bld_base;
struct lp_build_nir_aos_context *bld = lp_nir_aos_context(bld_base);
unsigned location = var->data.driver_location;
if (deref_mode == nir_var_shader_in) {
@@ -149,8 +179,7 @@ emit_store_var(struct lp_build_nir_context *bld_base,
LLVMValueRef indir_index,
LLVMValueRef vals)
{
struct lp_build_nir_aos_context *bld =
(struct lp_build_nir_aos_context *)bld_base;
struct lp_build_nir_aos_context *bld = lp_nir_aos_context(bld_base);
struct gallivm_state *gallivm = bld_base->base.gallivm;
unsigned location = var->data.driver_location;
@@ -222,8 +251,7 @@ emit_load_ubo(struct lp_build_nir_context *bld_base,
LLVMValueRef offset,
LLVMValueRef result[NIR_MAX_VEC_COMPONENTS])
{
struct lp_build_nir_aos_context *bld =
(struct lp_build_nir_aos_context *)bld_base;
struct lp_build_nir_aos_context *bld = lp_nir_aos_context(bld_base);
LLVMBuilderRef builder = bld_base->base.gallivm->builder;
struct gallivm_state *gallivm = bld_base->base.gallivm;
struct lp_type type = bld_base->base.type;
@@ -278,8 +306,7 @@ static void
emit_tex(struct lp_build_nir_context *bld_base,
struct lp_sampler_params *params)
{
struct lp_build_nir_aos_context *bld =
(struct lp_build_nir_aos_context *)bld_base;
struct lp_build_nir_aos_context *bld = lp_nir_aos_context(bld_base);
static const struct lp_derivatives derivs = { 0 };
params->type = bld_base->base.type;
params->texel[0] = bld->sampler->emit_fetch_texel(bld->sampler,