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

vbo: remove _mesa_prim parameter from vbo_copy_vertices

Browse source 
glBegin/End won't use _mesa_prim, so we need to stop using it.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7679>
This commit is contained in:
Marek Olšák 2020-11-02 01:46:24 -05:00
parent d2982f6061
commit bc6741832e
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/vbo/vbo_exec.c
View file

@ -260,13 +260,13 @@ vbo_merge_draws(struct gl_context *ctx, bool in_dlist,
unsigned
vbo_copy_vertices(struct gl_context *ctx,
GLenum mode,
struct _mesa_prim *last_prim,
unsigned start, unsigned *pcount, bool begin,
unsigned vertex_size,
bool in_dlist,
fi_type *dst,
const fi_type *src)
{
const unsigned count = last_prim->count;
const unsigned count = *pcount;
unsigned copy = 0;
switch (mode) {
@ -310,7 +310,7 @@ vbo_copy_vertices(struct gl_context *ctx,
}
break;
case GL_LINE_LOOP:
if (!in_dlist && last_prim->begin == 0) {
if (!in_dlist && begin == 0) {
/* We're dealing with the second or later section of a split/wrapped
* GL_LINE_LOOP. Since we're converting line loops to line strips,
* we've already incremented the last_prim->start counter by one to
@ -318,7 +318,7 @@ vbo_copy_vertices(struct gl_context *ctx,
* subtract one from last_prim->start) so that we copy the 0th vertex
* to the next vertex buffer.
*/
assert(last_prim->start > 0);
assert(start > 0);
src -= vertex_size;
}
FALLTHROUGH;
@ -337,7 +337,7 @@ vbo_copy_vertices(struct gl_context *ctx,
}
case GL_TRIANGLE_STRIP:
/* Draw an even number of triangles to keep front/back facing the same. */
last_prim->count -= count % 2;
*pcount -= count % 2;
FALLTHROUGH;
case GL_QUAD_STRIP:
if (count <= 1)

3
src/mesa/vbo/vbo_exec_draw.c
View file

@ -75,7 +75,8 @@ vbo_exec_copy_vertices(struct vbo_exec_context *exec)
const fi_type *src = exec->vtx.buffer_map + last_prim->start * sz;
return vbo_copy_vertices(ctx, ctx->Driver.CurrentExecPrimitive,
last_prim, sz, false, dst, src);
last_prim->start, &last_prim->count,
last_prim->begin, sz, false, dst, src);
}

2
src/mesa/vbo/vbo_private.h
View file

@ -199,7 +199,7 @@ vbo_merge_draws(struct gl_context *ctx, bool in_dlist,
unsigned
vbo_copy_vertices(struct gl_context *ctx,
GLenum mode,
struct _mesa_prim *last_prim,
unsigned start, unsigned *count, bool begin,
unsigned vertex_size,
bool in_dlist,
fi_type *dst,

3
src/mesa/vbo/vbo_save_api.c
View file

@ -128,7 +128,8 @@ copy_vertices(struct gl_context *ctx,
if (prim->end)
return 0;
return vbo_copy_vertices(ctx, prim->mode, prim, sz, true, dst, src);
return vbo_copy_vertices(ctx, prim->mode, prim->start, &prim->count,
prim->begin, sz, true, dst, src);
}