Mesa (master): pan/bi: Get rid of bi_emit_ld_uniform()

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: cc0950722c03fc3a4f1f6fb709c71e23b4d264e6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc0950722c03fc3a4f1f6fb709c71e23b4d264e6

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Fri Nov  6 09:57:26 2020 +0100

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 at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7472>

---

 src/panfrost/bifrost/bifrost_compile.c | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 650609ec42c..116bd1d08e0 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -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;