zink: fix 8 bit index handling code
index_size is specified in bytes, not bits.
Fixes: f4583b40863 ("zink: move 8bit index handling out of u_primconvert path")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8081>
(cherry picked from commit ba74e1be22f646f9639e85b12c7707e96351a075)
Conflicts:
src/gallium/drivers/zink/zink_draw.c
diff --git a/.pick_status.json b/.pick_status.json
index 2533e25..8361ecc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -175,7 +175,7 @@
"description": "zink: fix 8 bit index handling code",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "f4583b40863e3e57fe0df60daf1d5ab5ea8ebbae"
},
diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index 3daafcf..8f97bb5 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -272,7 +272,7 @@
if (dinfo->index_size > 0) {
uint32_t restart_index = util_prim_restart_index_from_size(dinfo->index_size);
if ((dinfo->primitive_restart && (dinfo->restart_index != restart_index)) ||
- (!screen->info.have_EXT_index_type_uint8 && dinfo->index_size == 8)) {
+ (!screen->info.have_EXT_index_type_uint8 && dinfo->index_size == 1)) {
util_translate_prim_restart_ib(pctx, dinfo, &index_buffer);
need_index_buffer_unref = true;
} else {