diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-13 10:09:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-13 10:09:30 +0200 |
| commit | 9ddf44af81782451cee798e06749ce3067a14a41 (patch) | |
| tree | f84b06f6897929113f080d8e505621fa6bf73fb9 /mesalib/src/mesa/program | |
| parent | f8e35ebbe71eed74ccf68af8ccda4182f1edc7f0 (diff) | |
| download | vcxsrv-9ddf44af81782451cee798e06749ce3067a14a41.tar.gz vcxsrv-9ddf44af81782451cee798e06749ce3067a14a41.tar.bz2 vcxsrv-9ddf44af81782451cee798e06749ce3067a14a41.zip | |
mesa pixman xkeyboard-config xserver git update 13 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/ir_to_mesa.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp index 255a8a76a..d675da269 100644 --- a/mesalib/src/mesa/program/ir_to_mesa.cpp +++ b/mesalib/src/mesa/program/ir_to_mesa.cpp @@ -1456,6 +1456,10 @@ ir_to_mesa_visitor::visit(ir_expression *ir) emit(ir, OPCODE_MOV, result_dst, op[0]); break; + case ir_binop_ubo_load: + assert(!"not supported"); + break; + case ir_quadop_vector: /* This operation should have already been handled. */ @@ -2455,7 +2459,7 @@ _mesa_generate_parameters_list_for_uniforms(struct gl_shader_program ir_variable *var = ((ir_instruction *) node)->as_variable(); if ((var == NULL) || (var->mode != ir_var_uniform) - || (strncmp(var->name, "gl_", 3) == 0)) + || var->uniform_block != -1 || (strncmp(var->name, "gl_", 3) == 0)) continue; add.process(var); |