summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300/r500_fragprog.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-05-28 10:03:10 +1000
committerDave Airlie <airlied@redhat.com>2008-05-28 10:03:10 +1000
commit5552500cdfc4b97f5c824f6af1f8213c785693f9 (patch)
tree593234de9e40c245e107b159357a3a3f94e55f09 /src/mesa/drivers/dri/r300/r500_fragprog.c
parent8c39e24ec397200420146faa4f48672eadeac9b2 (diff)
r500: cleanup warnings and include files
Diffstat (limited to 'src/mesa/drivers/dri/r300/r500_fragprog.c')
-rw-r--r--src/mesa/drivers/dri/r300/r500_fragprog.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.c b/src/mesa/drivers/dri/r300/r500_fragprog.c
index c7ece029c0..cdbec35da5 100644
--- a/src/mesa/drivers/dri/r300/r500_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.c
@@ -1495,7 +1495,7 @@ static char *toswiz(int swiz_val) {
static char *toop(int op_val)
{
- char *str;
+ char *str = NULL;
switch (op_val) {
case 0: str = "MAD"; break;
case 1: str = "DP3"; break;
@@ -1578,7 +1578,6 @@ static char *to_texop(int val)
static void dump_program(struct r500_fragment_program *fp)
{
- int pc = 0;
int n;
uint32_t inst;
uint32_t inst0;