diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c index 16a3c4b1fd8..56bfbf42035 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c @@ -43,7 +43,7 @@ fd3_emit_const_user(struct fd_ringbuffer *ring, const struct ir3_shader_variant *v, uint32_t regid, uint32_t sizedwords, const uint32_t *dwords) { - emit_const_asserts(ring, v, regid, sizedwords); + emit_const_asserts(v, regid, sizedwords); OUT_PKT3(ring, CP_LOAD_STATE, 2 + sizedwords); OUT_RING(ring, CP_LOAD_STATE_0_DST_OFF(regid / 2) | @@ -70,7 +70,7 @@ fd3_emit_const_bo(struct fd_ringbuffer *ring, uint32_t num_unit = sizedwords / 2; assert(num_unit % 2 == 0); - emit_const_asserts(ring, v, regid, sizedwords); + emit_const_asserts(v, regid, sizedwords); OUT_PKT3(ring, CP_LOAD_STATE, 2); OUT_RING(ring, CP_LOAD_STATE_0_DST_OFF(dst_off) | diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c index bb4b0cb454b..e3d6186026d 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c @@ -40,7 +40,7 @@ fd4_emit_const_user(struct fd_ringbuffer *ring, const struct ir3_shader_variant *v, uint32_t regid, uint32_t sizedwords, const uint32_t *dwords) { - emit_const_asserts(ring, v, regid, sizedwords); + emit_const_asserts(v, regid, sizedwords); OUT_PKT3(ring, CP_LOAD_STATE4, 2 + sizedwords); OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(regid / 4) | @@ -63,7 +63,7 @@ fd4_emit_const_bo(struct fd_ringbuffer *ring, uint32_t num_unit = sizedwords / 4; assert(num_unit % 4 == 0); - emit_const_asserts(ring, v, regid, sizedwords); + emit_const_asserts(v, regid, sizedwords); OUT_PKT3(ring, CP_LOAD_STATE4, 2); OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(dst_off) | diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c index e8212c371b3..49729806d49 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c +++ b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c @@ -41,7 +41,7 @@ fd5_emit_const_user(struct fd_ringbuffer *ring, const struct ir3_shader_variant *v, uint32_t regid, uint32_t sizedwords, const uint32_t *dwords) { - emit_const_asserts(ring, v, regid, sizedwords); + emit_const_asserts(v, regid, sizedwords); OUT_PKT7(ring, CP_LOAD_STATE4, 3 + sizedwords); OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(regid / 4) | @@ -65,7 +65,7 @@ fd5_emit_const_bo(struct fd_ringbuffer *ring, uint32_t num_unit = sizedwords / 4; assert(num_unit % 4 == 0); - emit_const_asserts(ring, v, regid, sizedwords); + emit_const_asserts(v, regid, sizedwords); OUT_PKT7(ring, CP_LOAD_STATE4, 3); OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(dst_off) | diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_const.cc b/src/gallium/drivers/freedreno/a6xx/fd6_const.cc index 4dba336d99b..a28b5a562b5 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_const.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_const.cc @@ -80,7 +80,7 @@ fd6_emit_const_user(struct fd_ringbuffer *ring, const struct ir3_shader_variant *v, uint32_t regid, uint32_t sizedwords, const uint32_t *dwords) { - emit_const_asserts(ring, v, regid, sizedwords); + emit_const_asserts(v, regid, sizedwords); /* NOTE we cheat a bit here, since we know mesa is aligning * the size of the user buffer to 16 bytes. And we want to @@ -117,7 +117,7 @@ fd6_emit_const_bo(struct fd_ringbuffer *ring, uint32_t num_unit = DIV_ROUND_UP(sizedwords, 4); assert(num_unit % 4 == 0); - emit_const_asserts(ring, v, regid, sizedwords); + emit_const_asserts(v, regid, sizedwords); if (fd6_geom_stage(v->type)) { OUT_PKT(ring, CP_LOAD_STATE6_GEOM, diff --git a/src/gallium/drivers/freedreno/ir3/ir3_const.h b/src/gallium/drivers/freedreno/ir3/ir3_const.h index 49fcf5dad28..90d7115b812 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_const.h +++ b/src/gallium/drivers/freedreno/ir3/ir3_const.h @@ -44,8 +44,7 @@ static void emit_const_ptrs(struct fd_ringbuffer *ring, struct fd_bo **bos, uint32_t *offsets); static void -emit_const_asserts(struct fd_ringbuffer *ring, - const struct ir3_shader_variant *v, uint32_t regid, +emit_const_asserts(const struct ir3_shader_variant *v, uint32_t regid, uint32_t sizedwords) { assert((v->type == MESA_SHADER_VERTEX) ||