We now bounds check properly in the uniform loading fast path, so
there's no need to disable it by pretending there are other UBO bindings
in use. The way this looks at the variable name was causing problems
when two piglit shaders, one with a name that triggered the hack and one
that didn't, got hashed to the same thing after stripping out the names.
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
u_bit_consecutive(variable->data.binding, aoa_size);
}
} else if (base_type != GLSL_TYPE_ATOMIC_UINT) {
u_bit_consecutive(variable->data.binding, aoa_size);
}
} else if (base_type != GLSL_TYPE_ATOMIC_UINT) {
- if (strncmp(variable->name, "state.", 6) == 0 ||
- strncmp(variable->name, "gl_", 3) == 0) {
- /* FIXME: figure out why piglit tests with builtin
- * uniforms are failing without this.
- */
- info->const_buffers_declared =
- u_bit_consecutive(0, SI_NUM_CONST_BUFFERS);
- } else {
- info->const_buffers_declared |= 1;
- info->const_file_max[0] = max_slot;
- }
+ info->const_buffers_declared |= 1;
+ info->const_file_max[0] = max_slot;