Revert "glsl: set vector_elements to 1 for samplers"
This reverts commit 75a31a20af
.
This breaks thousands of tests on i965 with malloc corruption.
This commit is contained in:
parent
85ca563b58
commit
b64da3d14e
|
@ -95,7 +95,12 @@ glsl_type::glsl_type(GLenum gl_type, glsl_base_type base_type,
|
||||||
|
|
||||||
memset(& fields, 0, sizeof(fields));
|
memset(& fields, 0, sizeof(fields));
|
||||||
|
|
||||||
|
if (is_sampler()) {
|
||||||
|
/* Samplers take no storage whatsoever. */
|
||||||
|
matrix_columns = vector_elements = 0;
|
||||||
|
} else {
|
||||||
matrix_columns = vector_elements = 1;
|
matrix_columns = vector_elements = 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,
|
glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,
|
||||||
|
|
|
@ -321,7 +321,8 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
unsigned elements = uni->type->components();
|
unsigned elements = (uni->type->is_sampler())
|
||||||
|
? 1 : uni->type->components();
|
||||||
const int dmul = uni->type->is_64bit() ? 2 : 1;
|
const int dmul = uni->type->is_64bit() ? 2 : 1;
|
||||||
const int rmul = glsl_base_type_is_64bit(returnType) ? 2 : 1;
|
const int rmul = glsl_base_type_is_64bit(returnType) ? 2 : 1;
|
||||||
|
|
||||||
|
@ -647,8 +648,10 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni,
|
||||||
{
|
{
|
||||||
unsigned i;
|
unsigned i;
|
||||||
|
|
||||||
const unsigned components = uni->type->vector_elements;
|
/* vector_elements and matrix_columns can be 0 for samplers.
|
||||||
const unsigned vectors = uni->type->matrix_columns;
|
*/
|
||||||
|
const unsigned components = MAX2(1, uni->type->vector_elements);
|
||||||
|
const unsigned vectors = MAX2(1, uni->type->matrix_columns);
|
||||||
const int dmul = uni->type->is_64bit() ? 2 : 1;
|
const int dmul = uni->type->is_64bit() ? 2 : 1;
|
||||||
|
|
||||||
/* Store the data in the driver's requested type in the driver's storage
|
/* Store the data in the driver's requested type in the driver's storage
|
||||||
|
@ -800,7 +803,8 @@ validate_uniform(GLint location, GLsizei count, const GLvoid *values,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Verify that the types are compatible. */
|
/* Verify that the types are compatible. */
|
||||||
const unsigned components = uni->type->vector_elements;
|
const unsigned components = uni->type->is_sampler()
|
||||||
|
? 1 : uni->type->vector_elements;
|
||||||
|
|
||||||
if (components != src_components) {
|
if (components != src_components) {
|
||||||
/* glUniformN() must match float/vecN type */
|
/* glUniformN() must match float/vecN type */
|
||||||
|
@ -921,7 +925,8 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const unsigned components = uni->type->vector_elements;
|
const unsigned components = uni->type->is_sampler()
|
||||||
|
? 1 : uni->type->vector_elements;
|
||||||
|
|
||||||
/* Page 82 (page 96 of the PDF) of the OpenGL 2.1 spec says:
|
/* Page 82 (page 96 of the PDF) of the OpenGL 2.1 spec says:
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue