diff options
| author | Marek Olšák <[email protected]> | 2020-02-13 23:22:44 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2020-03-04 19:54:43 -0500 |
| commit | ab7209fb83ee29b59eb20db2b683eb46b5268a93 (patch) | |
| tree | 11b18eb943d171221fb9a8ab5a1d0476fd5d3ebe /src/mesa/vbo/vbo_private.h | |
| parent | d740e3d6ee226c20870711c8df663b3aa97c8486 (diff) | |
vbo: merge more primitive types for glBegin/End (v2)
v2: clean it up more
Reviewed-by: Ian Romanick <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4052>
Diffstat (limited to 'src/mesa/vbo/vbo_private.h')
| -rw-r--r-- | src/mesa/vbo/vbo_private.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/vbo/vbo_private.h b/src/mesa/vbo/vbo_private.h index 93224d79ccd..1e37df881cd 100644 --- a/src/mesa/vbo/vbo_private.h +++ b/src/mesa/vbo/vbo_private.h @@ -179,11 +179,8 @@ void vbo_try_prim_conversion(struct _mesa_prim *p); bool -vbo_can_merge_prims(const struct _mesa_prim *p0, const struct _mesa_prim *p1); - -void -vbo_merge_prims(struct _mesa_prim *p0, const struct _mesa_prim *p1); - +vbo_merge_draws(struct gl_context *ctx, bool in_dlist, + struct _mesa_prim *p0, const struct _mesa_prim *p1); unsigned vbo_copy_vertices(struct gl_context *ctx, |