diff options
| author | Brian <[email protected]> | 2007-02-23 11:21:03 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-02-23 11:21:03 -0700 |
| commit | aa9d22a1c0f3256497088985c290d4046e089456 (patch) | |
| tree | e018082a234f43039e7ee8dd2dc7699818690faa /src/mesa/shader/slang | |
| parent | 99902198de9a81fa95ab058048d618c5ecb7856e (diff) | |
replace GLint with gl_state_index
Diffstat (limited to 'src/mesa/shader/slang')
| -rw-r--r-- | src/mesa/shader/slang/slang_builtin.c | 4 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_link.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/shader/slang/slang_builtin.c b/src/mesa/shader/slang/slang_builtin.c index 2e4687afc57..b01b74d3599 100644 --- a/src/mesa/shader/slang/slang_builtin.c +++ b/src/mesa/shader/slang/slang_builtin.c @@ -309,7 +309,7 @@ lookup_statevar(const char *var, GLint index1, GLint index2, const char *field, GLuint j; for (j = 0; j < 4; j++) { tokens[2] = tokens[3] = j; /* jth row of matrix */ - pos[j] = _mesa_add_state_reference(paramList, (GLint *) tokens); + pos[j] = _mesa_add_state_reference(paramList, tokens); assert(pos[j] >= 0); ASSERT(pos[j] >= 0); } @@ -317,7 +317,7 @@ lookup_statevar(const char *var, GLint index1, GLint index2, const char *field, } else { /* allocate a single register */ - GLint pos = _mesa_add_state_reference(paramList, (GLint *) tokens); + GLint pos = _mesa_add_state_reference(paramList, tokens); ASSERT(pos >= 0); return pos; } diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c index e2bb6ee2d80..f468a8cbc22 100644 --- a/src/mesa/shader/slang/slang_link.c +++ b/src/mesa/shader/slang/slang_link.c @@ -199,7 +199,7 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog) j = _mesa_add_named_constant(shProg->Uniforms, p->Name, pVals, p->Size); break; case PROGRAM_STATE_VAR: - j = _mesa_add_state_reference(shProg->Uniforms, (const GLint *) p->StateIndexes); + j = _mesa_add_state_reference(shProg->Uniforms, p->StateIndexes); break; case PROGRAM_UNIFORM: j = _mesa_add_uniform(shProg->Uniforms, p->Name, p->Size); |