diff options
| author | Caio Marcelo de Oliveira Filho <[email protected]> | 2019-08-21 12:16:29 -0700 |
|---|---|---|
| committer | Caio Marcelo de Oliveira Filho <[email protected]> | 2019-09-10 14:36:46 -0700 |
| commit | d40978f396523ea1b719c0999b0650b1cb4ebc54 (patch) | |
| tree | 34502a8472de4f96fabe52f9f8231e47b767c53e /src/mesa/program/ir_to_mesa.cpp | |
| parent | 4dd1ef9d0a39c52231e880b4900655991a7ced1d (diff) | |
mesa/program: Associate uniform storage without using names
Use the new UniformStorageIndex field in Parameter instead. This
mechanism was added so we could match those in the SPIR-V case, where
names are optional.
v2: Use UniformStorageIndex for all cases. (Timothy)
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/program/ir_to_mesa.cpp')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 30e8606b253..777fd168c7e 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2536,13 +2536,7 @@ _mesa_associate_uniform_storage(struct gl_context *ctx, if (params->Parameters[i].Type != PROGRAM_UNIFORM) continue; - unsigned location; - const bool found = - shader_program->UniformHash->get(location, params->Parameters[i].Name); - assert(found); - - if (!found) - continue; + unsigned location = params->Parameters[i].UniformStorageIndex; struct gl_uniform_storage *storage = &shader_program->data->UniformStorage[location]; |