mesa: Don't allow display lists or evaluators in core context

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 0a52a1a39e5665416bec339bb0fb1283dc9ab9b7..feddbaa7e64026d38de3e40b910ef8841ad43969 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1008,7 +1008,6 @@ _mesa_initialize_context(struct gl_context *ctx,
 
    switch (ctx->API) {
    case API_OPENGL:
-   case API_OPENGL_CORE:
 #if FEATURE_dlist
       ctx->Save = _mesa_create_save_table();
       if (!ctx->Save) {
@@ -1019,6 +1018,7 @@ _mesa_initialize_context(struct gl_context *ctx,
 
       _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
 #endif
+   case API_OPENGL_CORE:
       break;
    case API_OPENGLES:
       /**

diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index c73cfbb099c95fb799382b7d29e2433d94af8659..d8cd2dd7152f9485988f297298924a85c8b85fa5 100644 (file)
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -58,7 +58,9 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
       SET_EdgeFlag(tab, vfmt->EdgeFlag);
    }
 
-   _mesa_install_eval_vtxfmt(tab, vfmt);
+   if (ctx->API == API_OPENGL) {
+      _mesa_install_eval_vtxfmt(tab, vfmt);
+   }
 
    if (ctx->API != API_OPENGL_CORE) {
       SET_FogCoordfEXT(tab, vfmt->FogCoordfEXT);
@@ -94,7 +96,9 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
       SET_Vertex4fv(tab, vfmt->Vertex4fv);
    }
 
-   _mesa_install_dlist_vtxfmt(tab, vfmt);   /* glCallList / glCallLists */
+   if (ctx->API == API_OPENGL) {
+      _mesa_install_dlist_vtxfmt(tab, vfmt);   /* glCallList / glCallLists */
+   }
 
    if (ctx->API != API_OPENGL_CORE) {
       SET_Begin(tab, vfmt->Begin);