fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aux/primconvert: handle singular incomplete restarts

Browse source 
if no restart indices are found, this draw must be discarded to avoid
crashing later on

Fixes: 583070748c ("util/primconvert: handle rewriting of prim-restart draws with unsupported primtype")

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13630>
(cherry picked from commit bc345281ab)
This commit is contained in:
Mike Blumenkrantz 2021-11-01 12:48:39 -04:00 • committed by Dylan Baker
parent 809dee45dd
commit 5537232fca
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -283,7 +283,7 @@
"description": "aux/primconvert: handle singular incomplete restarts",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "583070748cb103560b173b5789998302d517b587"
},

7
src/gallium/auxiliary/indices/u_primconvert.c
View file

@ -202,8 +202,11 @@ util_primconvert_draw_vbo(struct primconvert_context *pc,
&direct_draw_func);
/* this should always be a direct translation */
assert(new_draw.count == total_index_count);
/* step 3: allocate a temp buffer for an intermediate rewrite step */
rewrite_buffer = malloc(index_size * total_index_count);
/* step 3: allocate a temp buffer for an intermediate rewrite step
* if no indices were found, this was a single incomplete restart and can be discarded
*/
if (total_index_count)
rewrite_buffer = malloc(index_size * total_index_count);
if (!rewrite_buffer) {
if (src_transfer)
pipe_buffer_unmap(pc->pipe, src_transfer);