summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2010-08-21 22:59:46 -0700
committerVinson Lee <[email protected]>2010-08-21 22:59:46 -0700
commit172953ef3a481612aa3bc9894941c2f9d34f509e (patch)
tree9f2d95d49f91a17804443a607fdb89e565f76288
parentfdedff2dba64ce25e8a572c1001f2b9e8eed00d2 (diff)
nvfx: Silence uninitialized variable warnings.
Variables weren't initialized on the error paths.
-rw-r--r--src/gallium/drivers/nvfx/nvfx_fragprog.c2
-rw-r--r--src/gallium/drivers/nvfx/nvfx_vertprog.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_fragprog.c b/src/gallium/drivers/nvfx/nvfx_fragprog.c
index 6c8f5c4708e..db33ecd78cf 100644
--- a/src/gallium/drivers/nvfx/nvfx_fragprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_fragprog.c
@@ -418,6 +418,8 @@ tgsi_src(struct nvfx_fpc *fpc, const struct tgsi_full_src_register *fsrc)
break;
default:
NOUVEAU_ERR("bad src file\n");
+ src.reg.index = 0;
+ src.reg.type = 0;
break;
}
diff --git a/src/gallium/drivers/nvfx/nvfx_vertprog.c b/src/gallium/drivers/nvfx/nvfx_vertprog.c
index b5dde2592e7..38f37168a18 100644
--- a/src/gallium/drivers/nvfx/nvfx_vertprog.c
+++ b/src/gallium/drivers/nvfx/nvfx_vertprog.c
@@ -379,6 +379,8 @@ tgsi_src(struct nvfx_vpc *vpc, const struct tgsi_full_src_register *fsrc) {
break;
default:
NOUVEAU_ERR("bad src file\n");
+ src.reg.index = 0;
+ src.reg.type = 0;
break;
}
@@ -410,6 +412,8 @@ tgsi_dst(struct nvfx_vpc *vpc, const struct tgsi_full_dst_register *fdst) {
break;
default:
NOUVEAU_ERR("bad dst file %i\n", fdst->Register.File);
+ dst.index = 0;
+ dst.type = 0;
break;
}