Mesa (master): vbo: use ctx instead of exec->ctx

Brian Paul brianp at kemper.freedesktop.org
Mon Feb 21 22:16:20 UTC 2011


Module: Mesa
Branch: master
Commit: 8b2598d000e4002bd0f07bf1eeecf4488fb6627c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b2598d000e4002bd0f07bf1eeecf4488fb6627c

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Feb 21 15:11:44 2011 -0700

vbo: use ctx instead of exec->ctx

---

 src/mesa/vbo/vbo_exec_api.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 03d6bb4..3941524 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -376,7 +376,7 @@ static void vbo_exec_fixup_vertex( struct gl_context *ctx,
 do {								\
    struct vbo_exec_context *exec = &vbo_context(ctx)->exec;	\
 									\
-   if (unlikely(!(exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT))) \
+   if (unlikely(!(ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT)))	\
       ctx->Driver.BeginVertices( ctx );                                 \
    if (unlikely(exec->vtx.active_sz[A] != N))				\
       vbo_exec_fixup_vertex(ctx, A, N);					\
@@ -395,8 +395,8 @@ do {								\
       for (i = 0; i < exec->vtx.vertex_size; i++)		\
 	 exec->vtx.buffer_ptr[i] = exec->vtx.vertex[i];		\
 								\
-      exec->vtx.buffer_ptr += exec->vtx.vertex_size;			\
-      exec->ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;	\
+      exec->vtx.buffer_ptr += exec->vtx.vertex_size;		\
+      ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;		\
 								\
       if (++exec->vtx.vert_count >= exec->vtx.max_vert)		\
 	 vbo_exec_vtx_wrap( exec );				\




More information about the mesa-commit mailing list