KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Matt Turner 2017-04-28 11:48:29 -07:00
parent 85ca563b58
commit b64da3d14e
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/glsl_types.cpp
View File

@ -95,7 +95,12 @@ glsl_type::glsl_type(GLenum gl_type, glsl_base_type base_type,
memset(& fields, 0, sizeof(fields));
matrix_columns = vector_elements = 1;
if (is_sampler()) {
/* Samplers take no storage whatsoever. */
matrix_columns = vector_elements = 0;
} else {
matrix_columns = vector_elements = 1;
}
}
glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields,

15
src/mesa/main/uniform_query.cpp
View File

@ -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 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;
const unsigned components = uni->type->vector_elements;
const unsigned vectors = uni->type->matrix_columns;
/* vector_elements and matrix_columns can be 0 for samplers.
*/
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;
/* 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. */
const unsigned components = uni->type->vector_elements;
const unsigned components = uni->type->is_sampler()
? 1 : uni->type->vector_elements;
if (components != src_components) {
/* glUniformN() must match float/vecN type */
@ -921,7 +925,8 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
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:
*