pan/bi: Get rid of bi_emit_ld_uniform()

Now that we lower uniforms to UBO we can get rid of bi_emit_ld_uniform().

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7472>
This commit is contained in:
Boris Brezillon 2020-11-06 09:57:26 +01:00
parent fd265fa020
commit cc0950722c

View file

@ -420,24 +420,6 @@ bi_emit_st_vary(bi_context *ctx, nir_intrinsic_instr *instr)
bi_emit(ctx, st);
}
static void
bi_emit_ld_uniform(bi_context *ctx, nir_intrinsic_instr *instr)
{
bi_instruction ld = bi_load(BI_LOAD_UNIFORM, instr);
ld.src[1] = BIR_INDEX_ZERO; /* TODO: UBO index */
ld.segment = BI_SEGMENT_UBO;
/* TODO: Indirect access, since we need to multiply by the element
* size. I believe we can get this lowering automatically via
* nir_lower_io (as mul instructions) with the proper options, but this
* is TODO */
assert(ld.src[0] & BIR_INDEX_CONSTANT);
ld.constant.u64 += ctx->sysvals.sysval_count;
ld.constant.u64 *= 16;
bi_emit(ctx, ld);
}
static void
bi_emit_ld_ubo(bi_context *ctx, nir_intrinsic_instr *instr)
{
@ -796,10 +778,6 @@ emit_intrinsic(bi_context *ctx, nir_intrinsic_instr *instr)
bi_emit_frag_out(ctx, instr);
break;
case nir_intrinsic_load_uniform:
bi_emit_ld_uniform(ctx, instr);
break;
case nir_intrinsic_load_ubo:
bi_emit_ld_ubo(ctx, instr);
break;