From: Brian <brian@yutani.localnet.net>
Date: Tue, 20 Feb 2007 15:04:40 +0000 (-0700)
Subject: Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d001b81c23dc1981cd5f4b0885d935d2c9a098b;p=mesa.git

Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
---

3d001b81c23dc1981cd5f4b0885d935d2c9a098b
diff --cc src/mesa/shader/prog_instruction.h
index a9156bcad59,8514cf69ecf..05265ce0ab1
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@@ -400,12 -400,8 +400,12 @@@ struct prog_instructio
  
     /**
      * For BRA and CAL instructions, the location to jump to.
 +    * For BGNLOOP, points to ENDLOOP (and vice-versa).
 +    * For BRK, points to BGNLOOP (which points to ENDLOOP).
 +    * For IF, points to else or endif.
 +    * For ELSE, points to endif.
      */
-    GLuint BranchTarget;
+    GLint BranchTarget;
  
     /**
      * For TEX instructions in shaders, the sampler to use for the