1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index fa552e8180b..df7647dd5ad 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -935,8 +935,11 @@ _mesa_initialize_context(struct gl_context *ctx,
       return GL_FALSE;
    }
 
-   /* setup the API dispatch tables */
-   ctx->Exec = _mesa_create_exec_table(ctx);
+   /* setup the API dispatch tables with all nop functions */
+   ctx->Exec = _mesa_alloc_dispatch_table(_gloffset_COUNT);
+
+   /* setup the API exec functions */
+   _mesa_initialize_exec_table(ctx);
 
    if (!ctx->Exec) {
       _mesa_reference_shared_state(ctx, &ctx->Shared, NULL);