From 9088058df018624fa1e669412d359b8a1adbac84 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 2 Nov 2020 01:46:24 -0500 Subject: [PATCH] vbo: remove _mesa_prim parameter from vbo_try_prim_conversion glBegin/End won't use _mesa_prim, so we need to stop using it. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mesa/vbo/vbo_exec.c | 13 ++++++------- src/mesa/vbo/vbo_exec_api.c | 2 +- src/mesa/vbo/vbo_private.h | 2 +- src/mesa/vbo/vbo_save_api.c | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c index f80801e..15de7ac 100644 --- a/src/mesa/vbo/vbo_exec.c +++ b/src/mesa/vbo/vbo_exec.c @@ -146,16 +146,15 @@ void vbo_exec_destroy( struct gl_context *ctx ) * This function converts 2-vertex line strips/loops into GL_LINES, etc. */ void -vbo_try_prim_conversion(struct _mesa_prim *p) +vbo_try_prim_conversion(GLubyte *mode, unsigned *count) { - if (p->mode == GL_LINE_STRIP && p->count == 2) { + if (*mode == GL_LINE_STRIP && *count == 2) { /* convert 2-vertex line strip to a separate line */ - p->mode = GL_LINES; - } - else if ((p->mode == GL_TRIANGLE_STRIP || p->mode == GL_TRIANGLE_FAN) - && p->count == 3) { + *mode = GL_LINES; + } else if ((*mode == GL_TRIANGLE_STRIP || *mode == GL_TRIANGLE_FAN) && + *count == 3) { /* convert 3-vertex tri strip or fan to a separate triangle */ - p->mode = GL_TRIANGLES; + *mode = GL_TRIANGLES; } /* Note: we can't convert a 4-vertex quad strip to a separate quad diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index ff46817..27b35f3 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -868,7 +868,7 @@ try_vbo_merge(struct vbo_exec_context *exec) assert(exec->vtx.prim_count >= 1); - vbo_try_prim_conversion(cur); + vbo_try_prim_conversion(&cur->mode, &cur->count); if (exec->vtx.prim_count >= 2) { struct gl_context *ctx = gl_context_from_vbo_exec(exec); diff --git a/src/mesa/vbo/vbo_private.h b/src/mesa/vbo/vbo_private.h index 19ce569..85caf36 100644 --- a/src/mesa/vbo/vbo_private.h +++ b/src/mesa/vbo/vbo_private.h @@ -186,7 +186,7 @@ vbo_compute_max_verts(const struct vbo_exec_context *exec) void -vbo_try_prim_conversion(struct _mesa_prim *p); +vbo_try_prim_conversion(GLubyte *mode, unsigned *count); bool vbo_merge_draws(struct gl_context *ctx, bool in_dlist, diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index ff516ec..fae2f4a 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -296,7 +296,7 @@ merge_prims(struct gl_context *ctx, struct _mesa_prim *prim_list, for (i = 1; i < *prim_count; i++) { struct _mesa_prim *this_prim = prim_list + i; - vbo_try_prim_conversion(this_prim); + vbo_try_prim_conversion(&this_prim->mode, &this_prim->count); if (vbo_merge_draws(ctx, true, prev_prim, this_prim)) { /* We've found a prim that just extend the previous one. Tack it -- 2.7.4