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

llvmpipe/setup: move setup code to explicit pointers.

Browse Source 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mihai Preda <mhpreda@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18837>
This commit is contained in:
Dave Airlie
2022-09-26 16:42:17 +10:00
parent 977476bb05
commit 1d6819bf5b
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gallium/drivers/llvmpipe/lp_state_setup.c
View File

@@ -71,6 +71,7 @@ struct lp_setup_args
LLVMValueRef dadx;
LLVMValueRef dady;
LLVMValueRef key;
LLVMTypeRef vec4f_type;
/* Derived:
*/
@@ -97,15 +98,15 @@ store_coef(struct gallivm_state *gallivm,
LLVMBuildStore(builder,
a0,
LLVMBuildGEP(builder, args->a0, &idx, 1, ""));
LLVMBuildGEP2(builder, args->vec4f_type, args->a0, &idx, 1, ""));
LLVMBuildStore(builder,
dadx,
LLVMBuildGEP(builder, args->dadx, &idx, 1, ""));
LLVMBuildGEP2(builder, args->vec4f_type, args->dadx, &idx, 1, ""));
LLVMBuildStore(builder,
dady,
LLVMBuildGEP(builder, args->dady, &idx, 1, ""));
LLVMBuildGEP2(builder, args->vec4f_type, args->dady, &idx, 1, ""));
}
@@ -155,6 +156,7 @@ emit_facing_coef(struct gallivm_state *gallivm,
static LLVMValueRef
vert_attrib(struct gallivm_state *gallivm,
LLVMTypeRef vert_type,
LLVMValueRef vert,
int attr,
int elem,
@@ -162,9 +164,11 @@ vert_attrib(struct gallivm_state *gallivm,
{
LLVMBuilderRef b = gallivm->builder;
LLVMValueRef idx[2];
LLVMTypeRef v_type = LLVMFloatTypeInContext(gallivm->context);
idx[0] = lp_build_const_int32(gallivm, attr);
idx[1] = lp_build_const_int32(gallivm, elem);
return LLVMBuildLoad(b, LLVMBuildGEP(b, vert, idx, 2, ""), name);
return LLVMBuildLoad2(b, v_type, LLVMBuildGEP2(b, vert_type, vert, idx, 2, ""), name);
}
@@ -183,9 +187,9 @@ lp_twoside(struct gallivm_state *gallivm,
LLVMValueRef front_facing = LLVMBuildICmp(b, LLVMIntEQ, facing,
lp_build_const_int32(gallivm, 0), ""); /** need i1 for if condition */
a0_back = LLVMBuildLoad(b, LLVMBuildGEP(b, args->v0, &idx2, 1, ""), "v0a_back");
a1_back = LLVMBuildLoad(b, LLVMBuildGEP(b, args->v1, &idx2, 1, ""), "v1a_back");
a2_back = LLVMBuildLoad(b, LLVMBuildGEP(b, args->v2, &idx2, 1, ""), "v2a_back");
a0_back = LLVMBuildLoad2(b, args->vec4f_type, LLVMBuildGEP2(b, args->vec4f_type, args->v0, &idx2, 1, ""), "v0a_back");
a1_back = LLVMBuildLoad2(b, args->vec4f_type, LLVMBuildGEP2(b, args->vec4f_type, args->v1, &idx2, 1, ""), "v1a_back");
a2_back = LLVMBuildLoad2(b, args->vec4f_type, LLVMBuildGEP2(b, args->vec4f_type, args->v2, &idx2, 1, ""), "v2a_back");
/* Possibly swap the front and back attrib values,
*
@@ -337,9 +341,9 @@ load_attribute(struct gallivm_state *gallivm,
/* Load the vertex data
*/
attribv[0] = LLVMBuildLoad(b, LLVMBuildGEP(b, args->v0, &idx, 1, ""), "v0a");
attribv[1] = LLVMBuildLoad(b, LLVMBuildGEP(b, args->v1, &idx, 1, ""), "v1a");
attribv[2] = LLVMBuildLoad(b, LLVMBuildGEP(b, args->v2, &idx, 1, ""), "v2a");
attribv[0] = LLVMBuildLoad2(b, args->vec4f_type, LLVMBuildGEP2(b, args->vec4f_type, args->v0, &idx, 1, ""), "v0a");
attribv[1] = LLVMBuildLoad2(b, args->vec4f_type, LLVMBuildGEP2(b, args->vec4f_type, args->v1, &idx, 1, ""), "v1a");
attribv[2] = LLVMBuildLoad2(b, args->vec4f_type, LLVMBuildGEP2(b, args->vec4f_type, args->v2, &idx, 1, ""), "v2a");
/* Potentially modify it according to twoside, etc:
*/
@@ -453,11 +457,14 @@ apply_perspective_corr(struct gallivm_state *gallivm,
/* premultiply by 1/w (v[0][3] is always 1/w):
*/
LLVMValueRef v0_oow = lp_build_broadcast_scalar(&args->bld,
vert_attrib(gallivm, args->v0, 0, 3, "v0_oow"));
vert_attrib(gallivm, args->vec4f_type,
args->v0, 0, 3, "v0_oow"));
LLVMValueRef v1_oow = lp_build_broadcast_scalar(&args->bld,
vert_attrib(gallivm, args->v1, 0, 3, "v1_oow"));
vert_attrib(gallivm, args->vec4f_type,
args->v1, 0, 3, "v1_oow"));
LLVMValueRef v2_oow = lp_build_broadcast_scalar(&args->bld,
vert_attrib(gallivm, args->v2, 0, 3, "v2_oow"));
vert_attrib(gallivm, args->vec4f_type,
args->v2, 0, 3, "v2_oow"));
attribv[0] = LLVMBuildFMul(b, attribv[0], v0_oow, "v0_oow_v0a");
attribv[1] = LLVMBuildFMul(b, attribv[1], v1_oow, "v1_oow_v1a");
@@ -686,6 +693,7 @@ generate_setup_variant(struct lp_setup_variant_key *key,
LLVMSetFunctionCallConv(variant->function, LLVMCCallConv);
struct lp_setup_args args;
args.vec4f_type = vec4f_type;
args.v0 = LLVMGetParam(variant->function, 0);
args.v1 = LLVMGetParam(variant->function, 1);
args.v2 = LLVMGetParam(variant->function, 2);