OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Ian Romanick
2012-08-17 14:32:43 -07:00
parent 2bcf555490
commit 8e7b6a69e9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/context.c
View File

@@ -1008,7 +1008,6 @@ _mesa_initialize_context(struct gl_context *ctx,
switch (ctx->API) { switch (ctx->API) {
case API_OPENGL: case API_OPENGL:
case API_OPENGL_CORE:
#if FEATURE_dlist #if FEATURE_dlist
ctx->Save = _mesa_create_save_table(); ctx->Save = _mesa_create_save_table();
if (!ctx->Save) { if (!ctx->Save) {
@@ -1019,6 +1018,7 @@ _mesa_initialize_context(struct gl_context *ctx,
_mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt ); _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
#endif #endif
case API_OPENGL_CORE:
break; break;
case API_OPENGLES: case API_OPENGLES:
/** /**

4
src/mesa/main/vtxfmt.c
View File

@@ -58,7 +58,9 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
SET_EdgeFlag(tab, vfmt->EdgeFlag); SET_EdgeFlag(tab, vfmt->EdgeFlag);
} }
if (ctx->API == API_OPENGL) {
_mesa_install_eval_vtxfmt(tab, vfmt); _mesa_install_eval_vtxfmt(tab, vfmt);
}
if (ctx->API != API_OPENGL_CORE) { if (ctx->API != API_OPENGL_CORE) {
SET_FogCoordfEXT(tab, vfmt->FogCoordfEXT); SET_FogCoordfEXT(tab, vfmt->FogCoordfEXT);
@@ -94,7 +96,9 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
SET_Vertex4fv(tab, vfmt->Vertex4fv); SET_Vertex4fv(tab, vfmt->Vertex4fv);
} }
if (ctx->API == API_OPENGL) {
_mesa_install_dlist_vtxfmt(tab, vfmt); /* glCallList / glCallLists */ _mesa_install_dlist_vtxfmt(tab, vfmt); /* glCallList / glCallLists */
}
if (ctx->API != API_OPENGL_CORE) { if (ctx->API != API_OPENGL_CORE) {
SET_Begin(tab, vfmt->Begin); SET_Begin(tab, vfmt->Begin);