mesa: Disallow more deprecated functions in core context

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

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index af73074d29f9ac6e6b464251fe63ee12c9da8bd7..167a9428634004bf5332675766dd9608e4249c2b 100644 (file)
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -582,7 +582,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    /* ARB 1. GL_ARB_multitexture */
 #if _HAVE_FULL_GL
    SET_ActiveTextureARB(exec, _mesa_ActiveTextureARB);
-   if (ctx->API != API_OPENGLES2) {
+   if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
       SET_ClientActiveTextureARB(exec, _mesa_ClientActiveTextureARB);
    }
 #endif

diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index d8cd2dd7152f9485988f297298924a85c8b85fa5..2b6e25ecdf67964e2c76a32e25433980785fb5df 100644 (file)
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -48,9 +48,8 @@ static void
 install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
                const GLvertexformat *vfmt)
 {
-   _mesa_install_arrayelt_vtxfmt(tab, vfmt);
-
    if (ctx->API != API_OPENGL_CORE) {
+      _mesa_install_arrayelt_vtxfmt(tab, vfmt);
       SET_Color3f(tab, vfmt->Color3f);
       SET_Color3fv(tab, vfmt->Color3fv);
       SET_Color4f(tab, vfmt->Color4f);