Mesa (master): vbo: simplify some code in vbo_exec_wrap_buffers()
Brian Paul
brianp at kemper.freedesktop.org
Tue Oct 20 19:59:46 UTC 2015
Module: Mesa
Branch: master
Commit: d24c3a680e9282c11bd411d0c4dbcff561c0f4ca
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d24c3a680e9282c11bd411d0c4dbcff561c0f4ca
Author: Brian Paul <brianp at vmware.com>
Date: Thu Oct 15 20:18:32 2015 -0600
vbo: simplify some code in vbo_exec_wrap_buffers()
Use a new 'last_prim' pointer to simplify things.
v2: remove unneeded assert(exec->vtx.prim_count > 0)
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Reviewed-by: Sinclair Yeh <syeh at vmware.com>
---
src/mesa/vbo/vbo_exec_api.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index c1f2146..f519f8a 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -71,17 +71,15 @@ static void vbo_exec_wrap_buffers( struct vbo_exec_context *exec )
exec->vtx.buffer_ptr = exec->vtx.buffer_map;
}
else {
- GLuint last_begin = exec->vtx.prim[exec->vtx.prim_count-1].begin;
+ struct _mesa_prim *last_prim = &exec->vtx.prim[exec->vtx.prim_count - 1];
+ const GLuint last_begin = last_prim->begin;
GLuint last_count;
if (_mesa_inside_begin_end(exec->ctx)) {
- GLint i = exec->vtx.prim_count - 1;
- assert(i >= 0);
- exec->vtx.prim[i].count = (exec->vtx.vert_count -
- exec->vtx.prim[i].start);
+ last_prim->count = exec->vtx.vert_count - last_prim->start;
}
- last_count = exec->vtx.prim[exec->vtx.prim_count-1].count;
+ last_count = last_prim->count;
/* Execute the buffer and save copied vertices.
*/
More information about the mesa-commit
mailing list