summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2014-02-06 17:43:29 +0100
committerMarek Olšák <[email protected]>2014-02-06 17:43:29 +0100
commit559af1df10e1390a49ff7b5ed37b4d44a0fcc9cb (patch)
tree06ac17025d91845537c7357fb3e0cad75baf05be /src/gallium/drivers
parentc32114460dbb7f33885c181a0d7dee07b15b8751 (diff)
gallium/radeon: fix warnings
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/r600/sb/sb_bc_finalize.cpp2
-rw-r--r--src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
index 54717f98a15..99a20eb00c8 100644
--- a/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
+++ b/src/gallium/drivers/r600/sb/sb_bc_finalize.cpp
@@ -814,6 +814,8 @@ unsigned bc_finalizer::get_stack_depth(node *n, unsigned &loops,
if (has_non_wqm_push)
++stack_elements;
break;
+ case HW_CLASS_UNKNOWN:
+ assert(0);
}
return stack_elements;
}
diff --git a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
index b7ded978f65..60ade78b5f2 100644
--- a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
+++ b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
@@ -159,7 +159,7 @@ emit_fetch(
struct radeon_llvm_context * ctx = radeon_llvm_context(bld_base);
struct lp_build_tgsi_soa_context *bld = lp_soa_context(bld_base);
LLVMBuilderRef builder = bld_base->base.gallivm->builder;
- LLVMValueRef result, ptr;
+ LLVMValueRef result = NULL, ptr;
if (swizzle == ~0) {
LLVMValueRef values[TGSI_NUM_CHANNELS];
@@ -409,8 +409,10 @@ emit_store(
break;
case TGSI_FILE_TEMPORARY:
- if (uses_temp_indirect_addressing(bld_base))
+ if (uses_temp_indirect_addressing(bld_base)) {
+ temp_ptr = NULL;
break;
+ }
temp_ptr = ctx->temps[ TGSI_NUM_CHANNELS * reg->Register.Index + chan_index];
break;