From: Jordan Justen <jordan.l.justen@intel.com>
Date: Mon, 19 Nov 2012 19:21:05 +0000 (-0800)
Subject: mesa: don't initialize VBO vtxfmt in _vbo_CreateContext
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=075f8722ab78df32878e9b6b721a1263cea53b27;p=mesa.git

mesa: don't initialize VBO vtxfmt in _vbo_CreateContext

The driver should call _mesa_initialize_vbo_vtxfmt after
computing the context version.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index c1624bf724e..ce4188fe2a3 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -971,7 +971,6 @@ _mesa_initialize_context(struct gl_context *ctx,
 	 return GL_FALSE;
       }
 
-      _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
       /* fall-through */
    case API_OPENGL_CORE:
       break;
diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c
index 81a4d25ff03..361d7a3e41a 100644
--- a/src/mesa/vbo/vbo_exec.c
+++ b/src/mesa/vbo/vbo_exec.c
@@ -49,10 +49,6 @@ void vbo_exec_init( struct gl_context *ctx )
    vbo_exec_vtx_init( exec );
    vbo_exec_array_init( exec );
 
-   /* Hook our functions into exec and compile dispatch tables.
-    */
-   _mesa_install_exec_vtxfmt( ctx, &exec->vtxfmt );
-
    ctx->Driver.NeedFlush = 0;
    ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;
    ctx->Driver.BeginVertices = vbo_exec_BeginVertices;
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 2aaa2895ca6..657c9aaee50 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -1120,10 +1120,6 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec )
    vbo_exec_vtxfmt_init( exec );
    _mesa_noop_vtxfmt_init(&exec->vtxfmt_noop);
 
-   /* Hook our functions into the dispatch table.
-    */
-   _mesa_install_exec_vtxfmt( ctx, &exec->vtxfmt );
-
    for (i = 0 ; i < VBO_ATTRIB_MAX ; i++) {
       ASSERT(i < Elements(exec->vtx.attrsz));
       exec->vtx.attrsz[i] = 0;
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 75b8ca3385f..b4c90a05c9e 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1667,5 +1667,4 @@ vbo_save_api_init(struct vbo_save_context *save)
    ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;
    ctx->ListState.ListVtxfmt.MultiDrawElementsEXT = _save_OBE_MultiDrawElements;
    ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _save_OBE_MultiDrawElementsBaseVertex;
-   _mesa_install_save_vtxfmt(ctx, &ctx->ListState.ListVtxfmt);
 }