mesa: assert if driver did not compute the version

Make sure drivers initialize the version before:
 * _mesa_initialize_exec_table is called
 * _mesa_initialize_exec_table_vbo is called
 * A context is made current

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

diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
index 7952ace280fac4d045f1f196ad75d49b12fa5fd5..da9ae716a543b70a7ac324222b73007349b5fc93 100644 (file)
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -127,6 +127,7 @@ _mesa_initialize_exec_table(struct gl_context *ctx)
    exec = ctx->Exec;
    assert(exec != NULL);
 
+   assert(ctx->Version > 0);
 """
 
 

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index ce4188fe2a34b260faee82d6735d25b9b4efcf54..fc2db127161b0a97f28565cb63fec60bdd9ba93b 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1461,7 +1461,7 @@ _mesa_make_current( struct gl_context *newCtx,
       }
 
       if (newCtx->FirstTimeCurrent) {
-         _mesa_compute_version(newCtx);
+         assert(newCtx->Version > 0);
 
          newCtx->Extensions.String = _mesa_make_extension_string(newCtx);
 

diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 5f42b338d0e5cb4dd8ded9dcf564cd0a10164c89..6d687de606b563163a51dc9f794d864636a08105 100644 (file)
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -47,6 +47,8 @@ static void
 install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
                const GLvertexformat *vfmt)
 {
+   assert(ctx->Version > 0);
+
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
       SET_Color4f(tab, vfmt->Color4f);
    }