diff options
| author | Ian Romanick <[email protected]> | 2012-08-17 14:32:43 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-08-29 15:09:36 -0700 |
| commit | 8e7b6a69e9cb00345e0c08966036b305cbda46c9 (patch) | |
| tree | d7a691b51a9f3f614c6933c49b93923aa9570d5b /src/mesa | |
| parent | 2bcf55549026972c186b5e6c9f351ee77da30166 (diff) | |
mesa: Don't allow display lists or evaluators in core context
Signed-off-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/context.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/vtxfmt.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 0a52a1a39e5..feddbaa7e64 100644 --- 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 c73cfbb099c..d8cd2dd7152 100644 --- 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); |