aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2020-01-17 18:37:35 -0500
committerMarek Olšák <[email protected]>2020-01-20 15:40:10 -0500
commit27cc7703d3da25656f7b953b11b69719d9df8d94 (patch)
tree46511db5d3c5af60768fd9de29daae0dc274e0f0
parentdf34fa14bb872447fed9076e06ffc504d85e2d1c (diff)
radeonsi: fix doubles and int64
Fixes: 57bd73e2296 - radeonsi: remove llvm_type_is_64bit Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>
-rw-r--r--src/gallium/drivers/radeonsi/si_shader_llvm_gs.c6
-rw-r--r--src/gallium/drivers/radeonsi/si_shader_llvm_tess.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c b/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c
index a11748325dd..a622ca5b0d2 100644
--- a/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c
@@ -88,7 +88,7 @@ static LLVMValueRef si_llvm_load_input_gs(struct ac_shader_abi *abi,
LLVMValueRef ptr = ac_build_gep0(&ctx->ac, ctx->esgs_ring, vtx_offset);
LLVMValueRef value = LLVMBuildLoad(ctx->ac.builder, ptr, "");
- if (ac_get_type_size(type) == 64) {
+ if (ac_get_type_size(type) == 8) {
ptr = LLVMBuildGEP(ctx->ac.builder, ptr,
&ctx->ac.i32_1, 1, "");
LLVMValueRef values[2] = {
@@ -122,7 +122,7 @@ static LLVMValueRef si_llvm_load_input_gs(struct ac_shader_abi *abi,
value = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1, ctx->i32_0,
vtx_offset, soffset, 0, ac_glc, true, false);
- if (ac_get_type_size(type) == 64) {
+ if (ac_get_type_size(type) == 8) {
LLVMValueRef value2;
soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle + 1) * 256, 0);
@@ -148,7 +148,7 @@ static LLVMValueRef si_nir_load_input_gs(struct ac_shader_abi *abi,
LLVMValueRef value[4];
for (unsigned i = 0; i < num_components; i++) {
unsigned offset = i;
- if (ac_get_type_size(type) == 64)
+ if (ac_get_type_size(type) == 8)
offset *= 2;
offset += component;
diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c b/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
index 549c4bf6b11..e809f287ff5 100644
--- a/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
+++ b/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
@@ -304,7 +304,7 @@ static LLVMValueRef buffer_load(struct si_shader_context *ctx,
return LLVMBuildBitCast(ctx->ac.builder, value, vec_type, "");
}
- if (ac_get_type_size(type) != 64) {
+ if (ac_get_type_size(type) != 8) {
value = ac_build_buffer_load(&ctx->ac, buffer, 4, NULL, base, offset,
0, ac_glc, can_speculate, false);
@@ -345,7 +345,7 @@ static LLVMValueRef lshs_lds_load(struct si_shader_context *ctx,
}
/* Split 64-bit loads. */
- if (ac_get_type_size(type) == 64) {
+ if (ac_get_type_size(type) == 8) {
LLVMValueRef lo, hi;
lo = lshs_lds_load(ctx, ctx->i32, swizzle, dw_addr);
@@ -489,7 +489,7 @@ static LLVMValueRef si_nir_load_tcs_varyings(struct ac_shader_abi *abi,
LLVMValueRef value[4];
for (unsigned i = 0; i < num_components; i++) {
unsigned offset = i;
- if (ac_get_type_size(type) == 64)
+ if (ac_get_type_size(type) == 8)
offset *= 2;
offset += component;
@@ -541,7 +541,7 @@ LLVMValueRef si_nir_load_input_tes(struct ac_shader_abi *abi,
LLVMValueRef value[4];
for (unsigned i = 0; i < num_components; i++) {
unsigned offset = i;
- if (ac_get_type_size(type) == 64) {
+ if (ac_get_type_size(type) == 8) {
offset *= 2;
if (offset == 4) {
ubyte name = info->input_semantic_name[driver_location + 1];