freedreno: Only upload UBO pointers for UBOs that haven't been lowered.

total constlen in shared programs: 2485933 -> 2462236 (-0.95%)

Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Eric Anholt
2019-06-05 15:39:22 -07:00
parent 01d0bad9ef
commit 4449572c47
+7 -1
View File
@@ -328,6 +328,13 @@ ir3_nir_scan_driver_consts(nir_shader *shader,
layout->image_dims.count;
layout->image_dims.count += 3; /* three const per */
break;
case nir_intrinsic_load_ubo:
if (nir_src_is_const(intr->src[0])) {
layout->num_ubos = MAX2(layout->num_ubos,
nir_src_as_uint(intr->src[0]) + 1);
} else {
layout->num_ubos = shader->info.num_ubos;
}
default:
break;
}
@@ -347,7 +354,6 @@ ir3_setup_const_state(struct ir3_shader *shader, nir_shader *nir)
ir3_nir_scan_driver_consts(nir, const_state);
const_state->num_uniforms = nir->num_uniforms;
const_state->num_ubos = nir->info.num_ubos;
debug_assert((shader->ubo_state.size % 16) == 0);
unsigned constoff = align(shader->ubo_state.size / 16, 4);