fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-09 08:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ir3: use empirical size for params as used by the shader

Browse source 
For example only some UCPs may be used by the shader, triggering asserts
that too many consts are being uploaded.

While we're at it, also fix the const size when loading UCPs, since
otherwise it doesn't correspond to what the shader is actually using.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5752>
This commit is contained in:
Ilia Mirkin 2020-07-05 01:58:01 -04:00 • committed by Marge Bot
parent f6aa0719cf
commit 836d41d772
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/freedreno/ir3/ir3_nir.c
View file

@ -483,8 +483,9 @@ ir3_nir_scan_driver_consts(nir_shader *shader,
MAX2(layout->num_driver_params, IR3_DP_INSTID_BASE + 1);
break;
case nir_intrinsic_load_user_clip_plane:
idx = nir_intrinsic_ucp_id(intr);
layout->num_driver_params =
MAX2(layout->num_driver_params, IR3_DP_UCP7_W + 1);
MAX2(layout->num_driver_params, IR3_DP_UCP0_X + (idx + 1) * 4);
break;
case nir_intrinsic_load_num_work_groups:
layout->num_driver_params =

15
src/gallium/drivers/freedreno/ir3/ir3_const.h
View file

@ -451,11 +451,6 @@ ir3_emit_vs_driver_params(const struct ir3_shader_variant *v,
info->index_bias : info->start,
[IR3_DP_VTXCNT_MAX] = max_tf_vtx(ctx, v),
};
/* if no user-clip-planes, we don't need to emit the
* entire thing:
*/
uint32_t vertex_params_size = 4;
if (v->key.ucp_enables) {
struct pipe_clip_state *ucp = &ctx->ucp;
unsigned pos = IR3_DP_UCP0_X;
@ -465,10 +460,16 @@ ir3_emit_vs_driver_params(const struct ir3_shader_variant *v,
pos++;
}
}
vertex_params_size = ARRAY_SIZE(vertex_params);
}
vertex_params_size = MAX2(vertex_params_size, const_state->num_driver_params);
/* Only emit as many params as needed, i.e. up to the highest enabled UCP
* plane. However a binning pass may drop even some of these, so limit to
* program max.
*/
const uint32_t vertex_params_size = MIN2(
const_state->num_driver_params,
(v->constlen - offset) * 4);
assert(vertex_params_size <= IR3_DP_VS_COUNT);
bool needs_vtxid_base =
ir3_find_sysval_regid(v, SYSTEM_VALUE_VERTEX_ID_ZERO_BASE) != regid(63, 0);