diff options
author | Brian <brian@yutani.localnet.net> | 2007-02-20 08:04:40 -0700 |
---|---|---|
committer | Brian <brian@yutani.localnet.net> | 2007-02-20 08:04:40 -0700 |
commit | 3d001b81c23dc1981cd5f4b0885d935d2c9a098b (patch) | |
tree | 7fbfcea0358a7c4cad634860d9bf8342e0782055 /src/mesa/shader/prog_instruction.h | |
parent | d434019633ccc537f07ec4e7d409bc93134367c8 (diff) | |
parent | 9449a4d8945de684609663468b96b7ed3aa884b9 (diff) |
Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
Diffstat (limited to 'src/mesa/shader/prog_instruction.h')
-rw-r--r-- | src/mesa/shader/prog_instruction.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index a9156bcad5..05265ce0ab 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -405,7 +405,7 @@ struct prog_instruction * 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 |