Mesa (master): mesa: fix warning about possibly undefined var in GLSL compiler

Brian Paul brianp at kemper.freedesktop.org
Sat Jan 3 00:30:42 UTC 2009


Module: Mesa
Branch: master
Commit: 724ed5b84bc2491da244d091de889d5b35503b5d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=724ed5b84bc2491da244d091de889d5b35503b5d

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan  2 17:30:08 2009 -0700

mesa: fix warning about possibly undefined var in GLSL compiler

---

 src/mesa/shader/slang/slang_emit.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index b7a3cfb..1c0a7bb 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -310,24 +310,22 @@ storage_to_dst_reg(struct prog_dst_register *dst, const slang_ir_storage *st)
       dst->WriteMask = swizzle_to_writemask(swizzle);
    }
    else {
-      GLuint writemask;
       switch (size) {
       case 1:
-         writemask = WRITEMASK_X << GET_SWZ(st->Swizzle, 0);
+         dst->WriteMask = WRITEMASK_X << GET_SWZ(st->Swizzle, 0);
          break;
       case 2:
-         writemask = WRITEMASK_XY;
+         dst->WriteMask = WRITEMASK_XY;
          break;
       case 3:
-         writemask = WRITEMASK_XYZ;
+         dst->WriteMask = WRITEMASK_XYZ;
          break;
       case 4:
-         writemask = WRITEMASK_XYZW;
+         dst->WriteMask = WRITEMASK_XYZW;
          break;
       default:
          ; /* error would have been caught above */
       }
-      dst->WriteMask = writemask;
    }
 
    dst->RelAddr = relAddr;




More information about the mesa-commit mailing list