diff options
| author | Brian Paul <[email protected]> | 2008-11-05 15:58:09 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-11-05 15:58:09 -0700 |
| commit | 80a718a63bf2fa817e346f0f5731ee9ef2e0e68b (patch) | |
| tree | 4a1bdb03ae8b8482b9a15e56c9604fcc34e95b0e /src/mesa/shader/prog_uniform.h | |
| parent | 7115b79b77e541f3eb81db00f6f0c34a0f224feb (diff) | |
| parent | de14fdd63f26a2e6fc55fad92c08966f269601a6 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/rtasm/rtasm_execmem.c
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_log.c
src/mesa/state_tracker/st_atom_framebuffer.c
Diffstat (limited to 'src/mesa/shader/prog_uniform.h')
| -rw-r--r-- | src/mesa/shader/prog_uniform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/shader/prog_uniform.h b/src/mesa/shader/prog_uniform.h index 735de28705a..deea7329912 100644 --- a/src/mesa/shader/prog_uniform.h +++ b/src/mesa/shader/prog_uniform.h @@ -50,6 +50,7 @@ struct gl_uniform const char *Name; /**< Null-terminated string */ GLint VertPos; GLint FragPos; + GLboolean Initialized; /**< For debug. Has this uniform been set? */ #if 0 GLenum DataType; /**< GL_FLOAT, GL_FLOAT_VEC2, etc */ GLuint Size; /**< Number of components (1..4) */ |