mesa: use new _vbo_install_exec_vtxfmt() function

Instead of reaching into the vbo_context object in vtxfmt.c

Reviewed-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index d3c83e5eb3ddf94195aa2bd08f8e9f5bc212ff58..ec8f387caec17abeff0a3d9b5e9fc19c40442b2a 100644 (file)
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -257,8 +257,7 @@ _mesa_install_save_vtxfmt(struct gl_context *ctx, const GLvertexformat *vfmt)
 void
 _mesa_initialize_vbo_vtxfmt(struct gl_context *ctx)
 {
-   struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
-   _mesa_install_exec_vtxfmt(ctx, &exec->vtxfmt);
+   _vbo_install_exec_vtxfmt(ctx);
    if (ctx->API == API_OPENGL_COMPAT) {
       _mesa_install_save_vtxfmt(ctx, &ctx->ListState.ListVtxfmt);
    }

diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c
index ed1b6508cdc22523cc8455727c5b3791f37fb8bb..3d3f838c4f5c7fb7ccea20b0e03e691f15b5795c 100644 (file)
--- a/src/mesa/vbo/vbo_context.c
+++ b/src/mesa/vbo/vbo_context.c
@@ -28,6 +28,7 @@
 #include "main/mtypes.h"
 #include "main/bufferobj.h"
 #include "math/m_eval.h"
+#include "main/vtxfmt.h"
 #include "vbo.h"
 #include "vbo_context.h"
 
@@ -181,6 +182,15 @@ vbo_draw_indirect_prims(struct gl_context *ctx,
 }
 
 
+void
+_vbo_install_exec_vtxfmt(struct gl_context *ctx)
+{
+   struct vbo_context *vbo = vbo_context(ctx);
+
+   _mesa_install_exec_vtxfmt(ctx, &vbo->exec.vtxfmt);
+}
+
+
 GLboolean
 _vbo_CreateContext(struct gl_context *ctx)
 {

diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h
index cd1cbd9641bca5cfa25396b78a40f1753b504110..2eac0198b80afef05bae249b6a579f8f4e97df2d 100644 (file)
--- a/src/mesa/vbo/vbo_context.h
+++ b/src/mesa/vbo/vbo_context.h
@@ -110,6 +110,10 @@ vbo_exec_invalidate_state(struct gl_context *ctx)
 }
 
 
+void
+_vbo_install_exec_vtxfmt(struct gl_context *ctx);
+
+
 /**
  * Return VP_x token to indicate whether we're running fixed-function
  * vertex transformation, an NV vertex program or ARB vertex program/shader.