diff options
author | Brian Paul <brianp@vmware.com> | 2009-01-02 16:32:26 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-01-02 16:32:26 -0700 |
commit | 0815ebccfc0a12d8f3e831928f1c4210b7f75ad8 (patch) | |
tree | 1e7db7e1d44e741215e5b4b11d33df91fe5b39a0 /src/mesa/shader/slang/slang_codegen.c | |
parent | eb9bbc5265562cb6f93688fc027ea76f91601e37 (diff) | |
parent | 1fad6ccb756ae33ca3115f59c99ca8abbeb0321e (diff) |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/main/ffvertex_prog.c
src/mesa/main/texenvprogram.c
Diffstat (limited to 'src/mesa/shader/slang/slang_codegen.c')
-rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index 7d764cb5c1..4976daf533 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -391,7 +391,7 @@ _slang_input_index(const char *name, GLenum target, GLuint *swizzleOut) const struct input_info *inputs = (target == GL_VERTEX_PROGRAM_ARB) ? vertInputs : fragInputs; - ASSERT(MAX_TEXTURE_UNITS == 8); /* if this fails, fix vertInputs above */ + ASSERT(MAX_TEXTURE_COORD_UNITS == 8); /* if this fails, fix vertInputs above */ for (i = 0; inputs[i].Name; i++) { if (strcmp(inputs[i].Name, name) == 0) { |