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

diff --cc src/mesa/shader/prog_instruction.h
index a9156bcad598468899863b91b4089823d2dc4439,8514cf69ecf4c5d20f1290bfea8565edc409e7fb..05265ce0ab1c4fcb5fce4aa3255bde8994e1a370
--- 1/src/mesa/shader/prog_instruction.h
--- 2/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