summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c2
-rw-r--r--src/mesa/drivers/dri/r300/compiler/radeon_optimize.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c b/src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c
index 603818f78fc..b7bca8c0cfa 100644
--- a/src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c
+++ b/src/mesa/drivers/dri/r300/compiler/r300_fragprog_swizzle.c
@@ -152,7 +152,6 @@ static void r300_swizzle_split(
split->NumPhases = 0;
while(mask) {
- const struct swizzle_data *best_swizzle = 0;
unsigned int best_matchcount = 0;
unsigned int best_matchmask = 0;
int i, comp;
@@ -179,7 +178,6 @@ static void r300_swizzle_split(
}
}
if (matchcount > best_matchcount) {
- best_swizzle = sd;
best_matchcount = matchcount;
best_matchmask = matchmask;
if (matchmask == (mask & RC_MASK_XYZ))
diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c b/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
index 447193ee817..21ea25dbf0d 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
@@ -621,13 +621,11 @@ static int peephole_add_presub_inv(
struct radeon_compiler * c,
struct rc_instruction * inst_add)
{
- unsigned int i, swz, mask;
+ unsigned int i, swz;
if (!is_presub_candidate(c, inst_add))
return 0;
- mask = inst_add->U.I.DstReg.WriteMask;
-
/* Check if src0 is 1. */
/* XXX It would be nice to use is_src_uniform_constant here, but that
* function only works if the register's file is RC_FILE_NONE */