Mesa (master): Revert "st/mesa: remove unused variables to fix compile warnings"
Brian Paul
brianp at kemper.freedesktop.org
Mon Oct 8 23:33:35 UTC 2012
Module: Mesa
Branch: master
Commit: 1aa8ad8b50f6bb8e7ec4911eef2518dc485b9285
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1aa8ad8b50f6bb8e7ec4911eef2518dc485b9285
Author: Brian Paul <brianp at vmware.com>
Date: Mon Oct 8 17:31:10 2012 -0600
Revert "st/mesa: remove unused variables to fix compile warnings"
This reverts commit 810d2e167c5a507084d1865a260809b847ca3201.
The pscreen variable is used in an assertion. Use "(void) pscreen;"
to silence the warning.
---
src/mesa/state_tracker/st_mesa_to_tgsi.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 92f5267..c614bde 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -1169,8 +1169,10 @@ st_translate_mesa_program(
* inconsistency, we insert a U2F.
*/
struct st_context *st = st_context(ctx);
+ struct pipe_screen *pscreen = st->pipe->screen;
assert(procType == TGSI_PROCESSOR_VERTEX);
assert(pscreen->get_shader_param(pscreen, PIPE_SHADER_VERTEX, PIPE_SHADER_CAP_INTEGERS));
+ (void) pscreen; /* silence non-debug build warnings */
if (!ctx->Const.NativeIntegers) {
struct ureg_dst temp = ureg_DECL_local_temporary(t->ureg);
ureg_U2F( t->ureg, ureg_writemask(temp, TGSI_WRITEMASK_X), t->systemValues[i]);
More information about the mesa-commit
mailing list