diff options
| author | Eric Anholt <[email protected]> | 2020-05-11 11:53:22 -0700 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-12 17:01:55 +0000 |
| commit | 4553fc66a5f23607c2e872d8ac8755c747bd0bd2 (patch) | |
| tree | dd69b313374bf02ad2de651c7690beeeec52ef1b /src | |
| parent | 0f2e44d55b01b3637fb96ce18840b8ab9250d508 (diff) | |
nir: Fix count when we didn't lower load_uniforms but did shift load_ubos.
The fixed commit was really nice in mostly fixing num_ubos to reflect the
shader after lowering, but for
dEQP-GLES31.functional.compute.basic.ubo_to_ssbo_single_invocation there
are no default uniforms and so we skipped the increment, even though we
shifted the block index up.
Fixes: 4777ee1a62f0 ("nir: Always create UBO variable when lowering uniforms to ubo")
Reviewed-by: Kristian H. Kristensen <[email protected]>
Reviewed-by: Erik Faye-Lund <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4992>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/nir/nir_lower_uniforms_to_ubo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/nir/nir_lower_uniforms_to_ubo.c b/src/compiler/nir/nir_lower_uniforms_to_ubo.c index 1046fdc6117..eef0d41440f 100644 --- a/src/compiler/nir/nir_lower_uniforms_to_ubo.c +++ b/src/compiler/nir/nir_lower_uniforms_to_ubo.c @@ -110,6 +110,7 @@ nir_lower_uniforms_to_ubo(nir_shader *shader, int multiplier) var->data.binding++; } } + shader->info.num_ubos++; if (shader->num_uniforms > 0) { const struct glsl_type *type = glsl_array_type(glsl_vec4_type(), @@ -126,7 +127,6 @@ nir_lower_uniforms_to_ubo(nir_shader *shader, int multiplier) ubo->interface_type = glsl_interface_type(&field, 1, GLSL_INTERFACE_PACKING_STD430, false, "__ubo0_interface"); - shader->info.num_ubos++; } } |