Mesa (main): util/prim_restart: assert the index size at the start of the function

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jun 9 15:07:37 UTC 2021


Module: Mesa
Branch: main
Commit: 5d54b64e6df887ff5148748368ef4e0adbf97ad9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d54b64e6df887ff5148748368ef4e0adbf97ad9

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 21 05:49:30 2021 -0400

util/prim_restart: assert the index size at the start of the function

this lets it be removed from the macro loop

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10966>

---

 src/gallium/auxiliary/util/u_prim_restart.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/gallium/auxiliary/util/u_prim_restart.c b/src/gallium/auxiliary/util/u_prim_restart.c
index f4f989a92f3..514d33f9c62 100644
--- a/src/gallium/auxiliary/util/u_prim_restart.c
+++ b/src/gallium/auxiliary/util/u_prim_restart.c
@@ -241,6 +241,16 @@ util_draw_vbo_without_prim_restart(struct pipe_context *context,
    assert(info->index_size);
    assert(info->primitive_restart);
 
+   switch (info->index_size) {
+   case 1:
+   case 2:
+   case 4:
+      break;
+   default:
+      assert(!"Bad index size");
+      return PIPE_ERROR_BAD_INPUT;
+   }
+
    if (indirect_info && indirect_info->buffer) {
       indirect = read_indirect_elements(context, indirect_info);
       info_count = indirect.count;



More information about the mesa-commit mailing list