diff options
| author | Marek Olšák <[email protected]> | 2020-02-13 23:15:47 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2020-03-04 19:54:42 -0500 |
| commit | fd8eb634fd93e61e47599fb74513eb0ab0bb3726 (patch) | |
| tree | febba82c2bce26da5af0f25a2db05e4674bb8a9b /src | |
| parent | e92a4f817d1f7a5094066e2a47a246fd5ccf94d6 (diff) | |
vbo: don't look at the second draw's count when merging 2 glBegin/End draws
Only the first count needs to be aligned.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Mathias Fröhlich <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4052>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/vbo/vbo_exec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c index 66ad8888bcd..359483949e3 100644 --- a/src/mesa/vbo/vbo_exec.c +++ b/src/mesa/vbo/vbo_exec.c @@ -198,15 +198,15 @@ vbo_can_merge_prims(const struct _mesa_prim *p0, const struct _mesa_prim *p1) return true; /* independent lines with no extra vertices */ - if (p0->mode == GL_LINES && p0->count % 2 == 0 && p1->count % 2 == 0) + if (p0->mode == GL_LINES && p0->count % 2 == 0) return true; /* independent tris */ - if (p0->mode == GL_TRIANGLES && p0->count % 3 == 0 && p1->count % 3 == 0) + if (p0->mode == GL_TRIANGLES && p0->count % 3 == 0) return true; /* independent quads */ - if (p0->mode == GL_QUADS && p0->count % 4 == 0 && p1->count % 4 == 0) + if (p0->mode == GL_QUADS && p0->count % 4 == 0) return true; return false; |