mesa: Branch 'glsl-compiler-1' - 3 commits

[Brian Paul]

 dev/null                                   |binary
 src/mesa/drivers/glslcompiler/glslcompiler |    0 
 src/mesa/shader/prog_instruction.h         |    4 ++++
 3 files changed, 4 insertions(+)

New commits:
diff-tree 174c5554145a54d925444ec47f06777420e04ea1 (from 3d001b81c23dc1981cd5f4b0885d935d2c9a098b)
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Feb 20 08:05:29 2007 -0700

    remove accidental check-in

diff --git a/src/mesa/drivers/glslcompiler/glslcompiler b/src/mesa/drivers/glslcompiler/glslcompiler
deleted file mode 100755
index a9d15e8..0000000
Binary files a/src/mesa/drivers/glslcompiler/glslcompiler and /dev/null differ
diff-tree 3d001b81c23dc1981cd5f4b0885d935d2c9a098b (from parents)
Merge: d434019633ccc537f07ec4e7d409bc93134367c8 9449a4d8945de684609663468b96b7ed3aa884b9
Author: Brian <brian at yutani.localnet.net>
Date:   Tue Feb 20 08:04:40 2007 -0700

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

diff --cc src/mesa/shader/prog_instruction.h
index a9156bc,8514cf6..05265ce
@@@ -400,12 -400,8 +400,12 @@@
  
     /**
      * 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
diff-tree d434019633ccc537f07ec4e7d409bc93134367c8 (from 2755c798f3cb89fcd4ece16cd740af1cd86a6b99)
Author: Brian <brian at yutani.localnet.net>
Date:   Mon Feb 5 18:04:35 2007 -0700

    additional comments for BranchTarget

diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h
index 100aac4..a9156bc 100644
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@ -400,6 +400,10 @@ struct prog_instruction
 
    /**
     * 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;