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

ac,radv,radeonsi: stop multiplying driver_location by 4

Browse Source 
It's no longer needed to do that.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7010>
This commit is contained in:
Samuel Pitoiset
2020-10-05 15:41:33 +02:00
parent 0a90dab6b4
commit 8f8ee5b95b
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/llvm/ac_nir_to_llvm.c
View File

@@ -2168,7 +2168,7 @@ static void visit_store_output(struct ac_nir_context *ctx, nir_intrinsic_instr *
LLVMValueRef vertex_index = vertex_index_src ? get_src(ctx, *vertex_index_src) : NULL; LLVMValueRef vertex_index = vertex_index_src ? get_src(ctx, *vertex_index_src) : NULL;
ctx->abi->store_tcs_outputs(ctx->abi, vertex_index, indir_index, src, ctx->abi->store_tcs_outputs(ctx->abi, vertex_index, indir_index, src,
writemask, component, base * 4); writemask, component, base);
return; return;
} }
@@ -3149,7 +3149,7 @@ static LLVMValueRef visit_load(struct ac_nir_context *ctx, nir_intrinsic_instr *
(ctx->stage == MESA_SHADER_TESS_EVAL && !is_output)) { (ctx->stage == MESA_SHADER_TESS_EVAL && !is_output)) {
LLVMValueRef result = ctx->abi->load_tess_varyings(ctx->abi, component_type, LLVMValueRef result = ctx->abi->load_tess_varyings(ctx->abi, component_type,
vertex_index, indir_index, vertex_index, indir_index,
base * 4, component, base, component,
count, !is_output); count, !is_output);
if (instr->dest.ssa.bit_size == 16) { if (instr->dest.ssa.bit_size == 16) {
result = ac_to_integer(&ctx->ac, result); result = ac_to_integer(&ctx->ac, result);
@@ -3164,7 +3164,7 @@ static LLVMValueRef visit_load(struct ac_nir_context *ctx, nir_intrinsic_instr *
if (ctx->stage == MESA_SHADER_GEOMETRY) { if (ctx->stage == MESA_SHADER_GEOMETRY) {
assert(nir_src_is_const(*vertex_index_src)); assert(nir_src_is_const(*vertex_index_src));
return ctx->abi->load_inputs(ctx->abi, base * 4, component, count, return ctx->abi->load_inputs(ctx->abi, base, component, count,
nir_src_as_uint(*vertex_index_src), component_type); nir_src_as_uint(*vertex_index_src), component_type);
} }

8
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -512,7 +512,7 @@ load_tcs_varyings(struct ac_shader_abi *abi,
struct radv_shader_context *ctx = radv_shader_context_from_abi(abi); struct radv_shader_context *ctx = radv_shader_context_from_abi(abi);
LLVMValueRef dw_addr, stride; LLVMValueRef dw_addr, stride;
LLVMValueRef value[4], result; LLVMValueRef value[4], result;
unsigned param = shader_io_get_unique_index(driver_location / 4); unsigned param = shader_io_get_unique_index(driver_location);
bool is_patch = vertex_index == NULL; bool is_patch = vertex_index == NULL;
@@ -551,7 +551,7 @@ store_tcs_output(struct ac_shader_abi *abi,
unsigned driver_location) unsigned driver_location)
{ {
struct radv_shader_context *ctx = radv_shader_context_from_abi(abi); struct radv_shader_context *ctx = radv_shader_context_from_abi(abi);
const unsigned location = driver_location / 4; const unsigned location = driver_location;
const bool is_patch = vertex_index == NULL; const bool is_patch = vertex_index == NULL;
LLVMValueRef dw_addr; LLVMValueRef dw_addr;
LLVMValueRef stride = NULL; LLVMValueRef stride = NULL;
@@ -625,7 +625,7 @@ load_tes_input(struct ac_shader_abi *abi,
LLVMValueRef buf_addr; LLVMValueRef buf_addr;
LLVMValueRef result; LLVMValueRef result;
LLVMValueRef oc_lds = ac_get_arg(&ctx->ac, ctx->args->oc_lds); LLVMValueRef oc_lds = ac_get_arg(&ctx->ac, ctx->args->oc_lds);
unsigned param = shader_io_get_unique_index(driver_location / 4); unsigned param = shader_io_get_unique_index(driver_location);
buf_addr = get_tcs_tes_buffer_address_params(ctx, param, vertex_index, param_index); buf_addr = get_tcs_tes_buffer_address_params(ctx, param, vertex_index, param_index);
@@ -656,7 +656,7 @@ load_gs_input(struct ac_shader_abi *abi,
vtx_offset = LLVMBuildMul(ctx->ac.builder, ctx->gs_vtx_offset[vtx_offset_param], vtx_offset = LLVMBuildMul(ctx->ac.builder, ctx->gs_vtx_offset[vtx_offset_param],
LLVMConstInt(ctx->ac.i32, 4, false), ""); LLVMConstInt(ctx->ac.i32, 4, false), "");
param = shader_io_get_unique_index(driver_location / 4); param = shader_io_get_unique_index(driver_location);
for (unsigned i = component; i < num_components + component; i++) { for (unsigned i = component; i < num_components + component; i++) {
if (ctx->ac.chip_class >= GFX9) { if (ctx->ac.chip_class >= GFX9) {

2
src/gallium/drivers/radeonsi/si_shader_llvm_gs.c
View File

@@ -104,7 +104,7 @@ static LLVMValueRef si_nir_load_input_gs(struct ac_shader_abi *abi,
LLVMValueRef value[4]; LLVMValueRef value[4];
for (unsigned i = component; i < component + num_components; i++) { for (unsigned i = component; i < component + num_components; i++) {
value[i] = si_llvm_load_input_gs(&ctx->abi, driver_location / 4, value[i] = si_llvm_load_input_gs(&ctx->abi, driver_location,
vertex_index, type, i); vertex_index, type, i);
} }

4
src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
View File

@@ -386,8 +386,6 @@ static LLVMValueRef si_nir_load_tcs_varyings(struct ac_shader_abi *abi, LLVMType
LLVMValueRef dw_addr, stride; LLVMValueRef dw_addr, stride;
ubyte semantic; ubyte semantic;
driver_location = driver_location / 4;
if (load_input) { if (load_input) {
semantic = info->input_semantic[driver_location]; semantic = info->input_semantic[driver_location];
} else { } else {
@@ -436,7 +434,6 @@ static LLVMValueRef si_nir_load_input_tes(struct ac_shader_abi *abi, LLVMTypeRef
struct si_shader_info *info = &ctx->shader->selector->info; struct si_shader_info *info = &ctx->shader->selector->info;
LLVMValueRef base, addr; LLVMValueRef base, addr;
driver_location = driver_location / 4;
ubyte semantic = info->input_semantic[driver_location]; ubyte semantic = info->input_semantic[driver_location];
assert((semantic >= VARYING_SLOT_PATCH0 || assert((semantic >= VARYING_SLOT_PATCH0 ||
@@ -475,7 +472,6 @@ static void si_nir_store_output_tcs(struct ac_shader_abi *abi,
LLVMValueRef values[8]; LLVMValueRef values[8];
bool is_tess_factor = false, is_tess_inner = false; bool is_tess_factor = false, is_tess_inner = false;
driver_location = driver_location / 4;
ubyte semantic = info->output_semantic[driver_location]; ubyte semantic = info->output_semantic[driver_location];
bool is_const = !param_index; bool is_const = !param_index;