From: Eric Anholt <eric@anholt.net>
Date: Thu, 9 Jul 2020 23:23:49 +0000 (-0700)
Subject: freedreno: Rename emit_const_bo() to emit_const_ptrs().
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=154299934d8a33205117ca1ab4ae2ef112b8447b

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 5d82dc306b6..09817c092e5 100644
--- 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 5e1513f79d3..9e9f80b43b0 100644
--- 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 40e1ab34e06..62bcfd1ca18 100644
--- 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 bfe2fec9683..ecd81f5aff2 100644
--- 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 774fd3f168b..a17f3bc8a4f 100644
--- 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);
 	}
 }