diff options
author | Rhys Kidd <[email protected]> | 2017-12-02 13:14:25 -0500 |
---|---|---|
committer | Rhys Kidd <[email protected]> | 2017-12-29 23:04:42 -0500 |
commit | 60c2d094831a2238551b6959d045638e78706924 (patch) | |
tree | ca2661053e8bd55d08f74c0be3a02fab81466d0d | |
parent | 634ca4c2c3edf7b0a6f32d02e6a4e86316019377 (diff) |
nv50/ir: Fix unused var warnings in release build
v2: Add preventative comment (Ilia Mirkin)
Reviewed-by: Eric Engestrom <[email protected]>
Reviewed-by: Pierre Moreau <[email protected]>
Signed-off-by: Rhys Kidd <[email protected]>
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp index cc2a88eb40a..139ff4a31dc 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp @@ -621,7 +621,7 @@ void CodeEmitterNV50::emitLOAD(const Instruction *i) { DataFile sf = i->src(0).getFile(); - int32_t offset = i->getSrc(0)->reg.data.offset; + MAYBE_UNUSED int32_t offset = i->getSrc(0)->reg.data.offset; switch (sf) { case FILE_SHADER_INPUT: diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp index 61d4e6a2d0b..0bbf21312fe 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp @@ -3308,7 +3308,9 @@ PostRaLoadPropagation::handleMADforNV50(Instruction *i) i->setSrc(1, def->getSrc(0)); } else { ImmediateValue val; - bool ret = def->src(0).getImmediate(val); + // getImmediate() has side-effects on the argument so this *shouldn't* + // be folded into the assert() + MAYBE_UNUSED bool ret = def->src(0).getImmediate(val); assert(ret); if (i->getSrc(1)->reg.data.id & 1) val.reg.data.u32 >>= 16; |