projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: new _mesa_valid_to_render() function
[mesa.git]
/
src
/
mesa
/
shader
/
prog_parameter.c
diff --git
a/src/mesa/shader/prog_parameter.c
b/src/mesa/shader/prog_parameter.c
index e9ed3985ee2da4c37eaea97de27c7b3255c68c6c..bcd8c5d9dc0af2f0497403f8364ee0ab21fd2702 100644
(file)
--- a/
src/mesa/shader/prog_parameter.c
+++ b/
src/mesa/shader/prog_parameter.c
@@
-327,15
+327,16
@@
_mesa_add_sampler(struct gl_program_parameter_list *paramList,
else {
GLuint i;
const GLint size = 1; /* a sampler is basically a texture unit number */
else {
GLuint i;
const GLint size = 1; /* a sampler is basically a texture unit number */
- GLfloat value;
+ GLfloat value
[4]
;
GLint numSamplers = 0;
for (i = 0; i < paramList->NumParameters; i++) {
if (paramList->Parameters[i].Type == PROGRAM_SAMPLER)
numSamplers++;
}
GLint numSamplers = 0;
for (i = 0; i < paramList->NumParameters; i++) {
if (paramList->Parameters[i].Type == PROGRAM_SAMPLER)
numSamplers++;
}
- value = (GLfloat) numSamplers;
+ value[0] = (GLfloat) numSamplers;
+ value[1] = value[2] = value[3] = 0.0F;
(void) _mesa_add_parameter(paramList, PROGRAM_SAMPLER, name,
(void) _mesa_add_parameter(paramList, PROGRAM_SAMPLER, name,
- size, datatype,
&
value, NULL, 0x0);
+ size, datatype, value, NULL, 0x0);
return numSamplers;
}
}
return numSamplers;
}
}