freedreno: Rename emit_const_bo() to emit_const_ptrs().

I keep thinking it's the "upload from inside a BO" path when it's not.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5990>

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
index 5d82dc306b64d9e96abd8b2a0ad13cb010053db5..09817c092e52cf3583dee82e8542dbb20a1d7dd3 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
@@ -93,7 +93,7 @@ fd3_emit_const(struct fd_ringbuffer *ring, gl_shader_stage type,
 }
 
 static void
-fd3_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type,
+fd3_emit_const_ptrs(struct fd_ringbuffer *ring, gl_shader_stage type,
                uint32_t regid, uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
        uint32_t anum = align(num, 4);
@@ -140,13 +140,13 @@ emit_const(struct fd_ringbuffer *ring,
 }
 
 static void
-emit_const_bo(struct fd_ringbuffer *ring,
+emit_const_ptrs(struct fd_ringbuffer *ring,
                const struct ir3_shader_variant *v, uint32_t dst_offset,
                uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
        /* TODO inline this */
        assert(dst_offset + num <= v->constlen * 4);
-       fd3_emit_const_bo(ring, v->type, dst_offset, num, prscs, offsets);
+       fd3_emit_const_ptrs(ring, v->type, dst_offset, num, prscs, offsets);
 }
 
 #define VERT_TEX_OFF    0

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
index 5e1513f79d3220f2085a3a4fce3535d1954fa65b..9e9f80b43b0ed6b55e34fcd41ea8cbb5260fc038 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
@@ -88,7 +88,7 @@ fd4_emit_const(struct fd_ringbuffer *ring, gl_shader_stage type,
 }
 
 static void
-fd4_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type,
+fd4_emit_const_ptrs(struct fd_ringbuffer *ring, gl_shader_stage type,
                uint32_t regid, uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
        uint32_t anum = align(num, 4);
@@ -135,13 +135,13 @@ emit_const(struct fd_ringbuffer *ring,
 }
 
 static void
-emit_const_bo(struct fd_ringbuffer *ring,
+emit_const_ptrs(struct fd_ringbuffer *ring,
                const struct ir3_shader_variant *v, uint32_t dst_offset,
                uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
        /* TODO inline this */
        assert(dst_offset + num <= v->constlen * 4);
-       fd4_emit_const_bo(ring, v->type, dst_offset, num, prscs, offsets);
+       fd4_emit_const_ptrs(ring, v->type, dst_offset, num, prscs, offsets);
 }
 
 static void

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c
index 40e1ab34e06e322694dc867d5d78d9e3fa358009..62bcfd1ca18b05940abcbc87f523960882cce142 100644 (file)
--- a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c
@@ -92,7 +92,7 @@ fd5_emit_const(struct fd_ringbuffer *ring, gl_shader_stage type,
 }
 
 static void
-fd5_emit_const_bo(struct fd_ringbuffer *ring, gl_shader_stage type,
+fd5_emit_const_ptrs(struct fd_ringbuffer *ring, gl_shader_stage type,
                uint32_t regid, uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
        uint32_t anum = align(num, 2);
@@ -143,13 +143,13 @@ emit_const(struct fd_ringbuffer *ring,
 }
 
 static void
-emit_const_bo(struct fd_ringbuffer *ring,
+emit_const_ptrs(struct fd_ringbuffer *ring,
                const struct ir3_shader_variant *v, uint32_t dst_offset,
                uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
        /* TODO inline this */
        assert(dst_offset + num <= v->constlen * 4);
-       fd5_emit_const_bo(ring, v->type, dst_offset, num, prscs, offsets);
+       fd5_emit_const_ptrs(ring, v->type, dst_offset, num, prscs, offsets);
 }
 
 void

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_const.c b/src/gallium/drivers/freedreno/a6xx/fd6_const.c
index bfe2fec96832aea7c9923445a9a6a59ed437e766..ecd81f5aff295a130ce6e60404399841550dac13 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_const.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_const.c
@@ -123,7 +123,7 @@ emit_const(struct fd_ringbuffer *ring,
 }
 
 static void
-emit_const_bo(struct fd_ringbuffer *ring,
+emit_const_ptrs(struct fd_ringbuffer *ring,
                const struct ir3_shader_variant *v, uint32_t dst_offset,
                uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_const.h b/src/gallium/drivers/freedreno/ir3/ir3_const.h
index 774fd3f168bfffe3e78b2957ed4d25b4d3d58b5f..a17f3bc8a4f986459c270c2980b345f60c41acb8 100644 (file)
--- a/src/gallium/drivers/freedreno/ir3/ir3_const.h
+++ b/src/gallium/drivers/freedreno/ir3/ir3_const.h
@@ -44,7 +44,7 @@ static void emit_const(struct fd_ringbuffer *ring,
                uint32_t offset, uint32_t size,
                const void *user_buffer, struct pipe_resource *buffer);
 
-static void emit_const_bo(struct fd_ringbuffer *ring,
+static void emit_const_ptrs(struct fd_ringbuffer *ring,
                const struct ir3_shader_variant *v, uint32_t dst_offset,
                uint32_t num, struct pipe_resource **prscs, uint32_t *offsets);
 
@@ -176,7 +176,7 @@ ir3_emit_ubos(struct fd_context *ctx, const struct ir3_shader_variant *v,
 
                assert(offset * 4 + params <= v->constlen * 4);
 
-               emit_const_bo(ring, v, offset * 4, params, prscs, offsets);
+               emit_const_ptrs(ring, v, offset * 4, params, prscs, offsets);
        }
 }
 
@@ -330,7 +330,7 @@ emit_tfbos(struct fd_context *ctx, const struct ir3_shader_variant *v,
 
                assert(offset * 4 + params <= v->constlen * 4);
 
-               emit_const_bo(ring, v, offset * 4, params, prscs, offsets);
+               emit_const_ptrs(ring, v, offset * 4, params, prscs, offsets);
        }
 }