KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/vbo: be more comprehensive for degenerate primitive conversion in dlists 

these shouldn't result in any sort of draw, and passing the unsupported primtype
to the driver is invalid

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13845>
This commit is contained in:
Mike Blumenkrantz 2021-11-16 10:57:24 -05:00 committed by Marge Bot
parent 29d319c767
commit 2a4c56e4e3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/vbo/vbo_save_api.c
View File

@ -645,12 +645,11 @@ compile_vertex_list(struct gl_context *ctx)
PV_LAST, PV_LAST,
&pmode, &index_size, &new_count,
&trans_func);
if (new_count > 0) {
if (new_count > 0)
trans_func(original_prims[i].start, new_count, tmp_indices);
vertex_count = new_count;
mode = (GLubyte)pmode;
converted_prim = true;
}
vertex_count = new_count;
mode = (GLubyte)pmode;
converted_prim = true;
}
/* If 2 consecutive prims use the same mode => merge them. */
@ -734,9 +733,10 @@ compile_vertex_list(struct gl_context *ctx)
merged_prims[last_valid_prim].count = idx - start;
}
merged_prims[last_valid_prim].mode = mode;
}
assert(idx > 0 && idx <= max_index_count);
/* converted prims will filter incomplete primitives and may have no indices */
assert((idx > 0 || converted_prim) && idx <= max_index_count);
}
unsigned merged_prim_count = last_valid_prim + 1;
node->cold->ib.ptr = NULL;