freedreno: fix off-by-one in assertions checking for const sizes

Caused assertions to trip even though everything was fine. The number of
constants can be equal to length, so we need less-than-or-equal.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5077>

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
index acb09f58e0d77f977b67a154382e19b54dd31e33..d03949177a3942cea6d66944628f28bbcb165e7e 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c
@@ -145,7 +145,7 @@ emit_const_bo(struct fd_ringbuffer *ring,
                uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
        /* TODO inline this */
-       assert(dst_offset + num < v->constlen * 4);
+       assert(dst_offset + num <= v->constlen * 4);
        fd3_emit_const_bo(ring, v->type, dst_offset, num, prscs, offsets);
 }
 

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
index ff5a6a3127111917e36b5987b48e6b7ea49fd9a3..0aff8fe3e2f19f48507467b99042dbbc886f972e 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
@@ -140,7 +140,7 @@ emit_const_bo(struct fd_ringbuffer *ring,
                uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
        /* TODO inline this */
-       assert(dst_offset + num < v->constlen * 4);
+       assert(dst_offset + num <= v->constlen * 4);
        fd4_emit_const_bo(ring, v->type, dst_offset, num, prscs, offsets);
 }
 

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c
index 570eb7dc1d8774dafe32a3ea354be850006ee5db..ac8a5f59df0f46255bb369d929483075cd101043 100644 (file)
--- a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c
@@ -148,7 +148,7 @@ emit_const_bo(struct fd_ringbuffer *ring,
                uint32_t num, struct pipe_resource **prscs, uint32_t *offsets)
 {
        /* TODO inline this */
-       assert(dst_offset + num < v->constlen * 4);
+       assert(dst_offset + num <= v->constlen * 4);
        fd5_emit_const_bo(ring, v->type, dst_offset, num, prscs, offsets);
 }
 

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_const.h b/src/gallium/drivers/freedreno/ir3/ir3_const.h
index a0076991b86e4ebd2b391cac0868b730119c6625..64cd39684ad3045ee6a4246c5cad3287dee10464 100644 (file)
--- a/src/gallium/drivers/freedreno/ir3/ir3_const.h
+++ b/src/gallium/drivers/freedreno/ir3/ir3_const.h
@@ -155,7 +155,7 @@ ir3_emit_ubos(struct fd_screen *screen, const struct ir3_shader_variant *v,
                        }
                }
 
-               assert(offset * 4 + params < v->constlen * 4);
+               assert(offset * 4 + params <= v->constlen * 4);
 
                emit_const_bo(ring, v, offset * 4, params, prscs, offsets);
        }
@@ -309,7 +309,7 @@ emit_tfbos(struct fd_context *ctx, const struct ir3_shader_variant *v,
                        }
                }
 
-               assert(offset * 4 + params < v->constlen * 4);
+               assert(offset * 4 + params <= v->constlen * 4);
 
                emit_const_bo(ring, v, offset * 4, params, prscs, offsets);
        }