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

ir_to_mesa: Provide a restricted type size to _mesa_add_uniform.

Browse Source 
Fixes:
glsl-uniform-out-of-bounds.
This commit is contained in:
Eric Anholt
2010-07-27 15:10:38 -07:00
parent 59c45e9e6c
commit 9a670c2e9b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/program/ir_to_mesa.cpp
+10 -1
View File
@@ -1061,6 +1061,7 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir)
ir_to_mesa_src_reg src_reg;
variable_storage *entry = find_variable_storage(ir->var);
unsigned int loc;
int len;
if (!entry) {
switch (ir->var->mode) {
@@ -1089,9 +1090,17 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir)
assert(ir->var->type->gl_type != 0 &&
ir->var->type->gl_type != GL_INVALID_ENUM);
if (ir->var->type->is_vector() ||
ir->var->type->is_scalar()) {
len = ir->var->type->vector_elements;
} else {
len = type_size(ir->var->type) * 4;
}
loc = _mesa_add_uniform(this->prog->Parameters,
ir->var->name,
type_size(ir->var->type) * 4,
len,
ir->var->type->gl_type,
NULL);