summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2016-06-29 14:23:23 +0200
committerHans de Goede <hdegoede@redhat.com>2016-07-02 12:21:28 +0200
commit110ef733dcd3fd306c513a2546b6e0a7d3179263 (patch)
tree9d5bcc620689b4d1087cdc174e9f2f9505586d6d
parent1f3c8f36641d785db201b97bd2e5fdfcbac4645d (diff)
nouveau: Fix a couple of "foo may be used uninitialized' compiler warnings
These are all new false positives with gcc6. In nouveau_compiler.c: gcc6 no longer assumes that passing a pointer to a variable into a function initialises that variable. In nv50_ir_from_tgsi.cpp op and mode are not set if there are 0 enabled dst channels, this never happens, but gcc cannot know this. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ilia Mirkin <imirkin@alum.mit.edu>
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp4
-rw-r--r--src/gallium/drivers/nouveau/nouveau_compiler.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
index c0816cbf0609..825a44f35fb6 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp
@@ -2750,8 +2750,8 @@ Converter::handleINTERP(Value *dst[4])
Value *offset = NULL, *ptr = NULL, *w = NULL;
Symbol *sym[4] = { NULL };
bool linear;
- operation op;
- int c, mode;
+ operation op = OP_NOP;
+ int c, mode = 0;
tgsi::Instruction::SrcRegister src = tgsi.getSrc(0);
diff --git a/src/gallium/drivers/nouveau/nouveau_compiler.c b/src/gallium/drivers/nouveau/nouveau_compiler.c
index e00ad3fc0b87..d8009f5bfe43 100644
--- a/src/gallium/drivers/nouveau/nouveau_compiler.c
+++ b/src/gallium/drivers/nouveau/nouveau_compiler.c
@@ -142,7 +142,7 @@ main(int argc, char *argv[])
const char *filename = NULL;
FILE *f;
char text[65536] = {0};
- unsigned size, *code;
+ unsigned size = 0, *code = NULL;
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-a"))