Merge remote-tracking branch 'origin/released'

1 files changed, 127 insertions, 90 deletions

diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c
index 81be46d5f..6b1499f4f 100644
--- a/mesalib/src/mesa/main/api_exec.c
+++ b/mesalib/src/mesa/main/api_exec.c
@@ -158,7 +158,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_GetError(exec, _mesa_GetError);
    SET_GetFloatv(exec, _mesa_GetFloatv);
    SET_GetString(exec, _mesa_GetString);
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_LineStipple(exec, _mesa_LineStipple);
    }
    SET_LineWidth(exec, _mesa_LineWidth);
@@ -197,13 +197,13 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
    SET_Viewport(exec, _mesa_Viewport);
 
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       _mesa_init_accum_dispatch(exec);
       _mesa_init_dlist_dispatch(exec);
    }
 
    SET_ClearDepth(exec, _mesa_ClearDepth);
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_ClearIndex(exec, _mesa_ClearIndex);
       SET_ClipPlane(exec, _mesa_ClipPlane);
       SET_ColorMaterial(exec, _mesa_ColorMaterial);
@@ -213,9 +213,11 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_DepthRange(exec, _mesa_DepthRange);
 
    _mesa_init_drawpix_dispatch(exec);
-   _mesa_init_feedback_dispatch(exec);
+   if (ctx->API == API_OPENGL) {
+      _mesa_init_feedback_dispatch(exec);
+   }
 
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT);
       SET_Fogf(exec, _mesa_Fogf);
       SET_Fogfv(exec, _mesa_Fogfv);
@@ -241,7 +243,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv);
    SET_GetTexImage(exec, _mesa_GetTexImage);
    SET_Hint(exec, _mesa_Hint);
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_IndexMask(exec, _mesa_IndexMask);
    }
    SET_IsEnabled(exec, _mesa_IsEnabled);
@@ -257,24 +259,22 @@ _mesa_create_exec_table(struct gl_context *ctx)
       SET_LoadMatrixd(exec, _mesa_LoadMatrixd);
    }
 
-   _mesa_init_eval_dispatch(exec);
-
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
+      _mesa_init_eval_dispatch(exec);
       SET_MultMatrixd(exec, _mesa_MultMatrixd);
+      _mesa_init_pixel_dispatch(exec);
    }
 
-   _mesa_init_pixel_dispatch(exec);
-
    SET_PixelStoref(exec, _mesa_PixelStoref);
    SET_PointSize(exec, _mesa_PointSize);
    SET_PolygonMode(exec, _mesa_PolygonMode);
    SET_PolygonOffset(exec, _mesa_PolygonOffset);
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_PolygonStipple(exec, _mesa_PolygonStipple);
-   }
 
-   _mesa_init_attrib_dispatch(exec);
-   _mesa_init_rastpos_dispatch(exec);
+      _mesa_init_attrib_dispatch(exec);
+      _mesa_init_rastpos_dispatch(exec);
+   }
 
    SET_ReadPixels(exec, _mesa_ReadPixels);
    if (ctx->API != API_OPENGL_CORE) {
@@ -285,13 +285,15 @@ _mesa_create_exec_table(struct gl_context *ctx)
       SET_TexEnviv(exec, _mesa_TexEnviv);
    }
 
-   _mesa_init_texgen_dispatch(exec);
+   if (ctx->API != API_OPENGL_CORE) {
+      _mesa_init_texgen_dispatch(exec);
+   }
 
    SET_TexImage1D(exec, _mesa_TexImage1D);
    SET_TexParameterf(exec, _mesa_TexParameterf);
    SET_TexParameterfv(exec, _mesa_TexParameterfv);
    SET_TexParameteriv(exec, _mesa_TexParameteriv);
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_Translated(exec, _mesa_Translated);
    }
 
@@ -300,7 +302,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_DeleteTextures(exec, _mesa_DeleteTextures);
    SET_GenTextures(exec, _mesa_GenTextures);
 #if _HAVE_FULL_GL
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_AreTexturesResident(exec, _mesa_AreTexturesResident);
       SET_ColorPointer(exec, _mesa_ColorPointer);
    }
@@ -341,9 +343,11 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_BlendEquation(exec, _mesa_BlendEquation);
    SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT);
 
-   _mesa_init_colortable_dispatch(exec);
-   _mesa_init_convolve_dispatch(exec);
-   _mesa_init_histogram_dispatch(exec);
+   if (ctx->API == API_OPENGL) {
+      _mesa_init_colortable_dispatch(exec);
+      _mesa_init_convolve_dispatch(exec);
+      _mesa_init_histogram_dispatch(exec);
+   }
 
    /* OpenGL 2.0 */
    SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate);
@@ -362,7 +366,9 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    /* 3. GL_EXT_polygon_offset */
 #if _HAVE_FULL_GL
-   SET_PolygonOffsetEXT(exec, _mesa_PolygonOffsetEXT);
+   if (ctx->API == API_OPENGL) {
+      SET_PolygonOffsetEXT(exec, _mesa_PolygonOffsetEXT);
+   }
 #endif
 
    /* 6. GL_EXT_texture3d */
@@ -374,7 +380,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    /* 11. GL_EXT_histogram */
 #if 0
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_GetHistogramEXT(exec, _mesa_GetHistogram);
       SET_GetHistogramParameterfvEXT(exec, _mesa_GetHistogramParameterfv);
       SET_GetHistogramParameterivEXT(exec, _mesa_GetHistogramParameteriv);
@@ -397,7 +403,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    /* 30. GL_EXT_vertex_array */
 #if _HAVE_FULL_GL
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_ColorPointerEXT(exec, _mesa_ColorPointerEXT);
       SET_EdgeFlagPointerEXT(exec, _mesa_EdgeFlagPointerEXT);
       SET_IndexPointerEXT(exec, _mesa_IndexPointerEXT);
@@ -424,8 +430,10 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    /* 97. GL_EXT_compiled_vertex_array */
 #if _HAVE_FULL_GL
-   SET_LockArraysEXT(exec, _mesa_LockArraysEXT);
-   SET_UnlockArraysEXT(exec, _mesa_UnlockArraysEXT);
+   if (ctx->API == API_OPENGL) {
+      SET_LockArraysEXT(exec, _mesa_LockArraysEXT);
+      SET_UnlockArraysEXT(exec, _mesa_UnlockArraysEXT);
+   }
 #endif
 
    /* 148. GL_EXT_multi_draw_arrays */
@@ -454,54 +462,61 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    /* 233. GL_NV_vertex_program */
 #if FEATURE_NV_vertex_program
-   SET_BindProgramNV(exec, _mesa_BindProgram);
-   SET_DeleteProgramsNV(exec, _mesa_DeletePrograms);
-   SET_ExecuteProgramNV(exec, _mesa_ExecuteProgramNV);
-   SET_GenProgramsNV(exec, _mesa_GenPrograms);
-   SET_AreProgramsResidentNV(exec, _mesa_AreProgramsResidentNV);
-   SET_RequestResidentProgramsNV(exec, _mesa_RequestResidentProgramsNV);
-   SET_GetProgramParameterfvNV(exec, _mesa_GetProgramParameterfvNV);
-   SET_GetProgramParameterdvNV(exec, _mesa_GetProgramParameterdvNV);
-   SET_GetProgramivNV(exec, _mesa_GetProgramivNV);
-   SET_GetProgramStringNV(exec, _mesa_GetProgramStringNV);
-   SET_GetTrackMatrixivNV(exec, _mesa_GetTrackMatrixivNV);
-   SET_GetVertexAttribdvNV(exec, _mesa_GetVertexAttribdvNV);
-   SET_GetVertexAttribfvNV(exec, _mesa_GetVertexAttribfvNV);
-   SET_GetVertexAttribivNV(exec, _mesa_GetVertexAttribivNV);
-   SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV);
-   SET_IsProgramNV(exec, _mesa_IsProgramARB);
-   SET_LoadProgramNV(exec, _mesa_LoadProgramNV);
-   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); /* alias to ProgramParameter4dNV */
-   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);  /* alias to ProgramParameter4dvNV */
-   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);  /* alias to ProgramParameter4fNV */
-   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);  /* alias to ProgramParameter4fvNV */
-   SET_ProgramParameters4dvNV(exec, _mesa_ProgramParameters4dvNV);
-   SET_ProgramParameters4fvNV(exec, _mesa_ProgramParameters4fvNV);
-   SET_TrackMatrixNV(exec, _mesa_TrackMatrixNV);
-   SET_VertexAttribPointerNV(exec, _mesa_VertexAttribPointerNV);
-   /* glVertexAttrib*NV functions handled in api_loopback.c */
+   if (ctx->API == API_OPENGL) {
+      SET_BindProgramNV(exec, _mesa_BindProgram);
+      SET_DeleteProgramsNV(exec, _mesa_DeletePrograms);
+      SET_ExecuteProgramNV(exec, _mesa_ExecuteProgramNV);
+      SET_GenProgramsNV(exec, _mesa_GenPrograms);
+      SET_AreProgramsResidentNV(exec, _mesa_AreProgramsResidentNV);
+      SET_RequestResidentProgramsNV(exec, _mesa_RequestResidentProgramsNV);
+      SET_GetProgramParameterfvNV(exec, _mesa_GetProgramParameterfvNV);
+      SET_GetProgramParameterdvNV(exec, _mesa_GetProgramParameterdvNV);
+      SET_GetProgramivNV(exec, _mesa_GetProgramivNV);
+      SET_GetProgramStringNV(exec, _mesa_GetProgramStringNV);
+      SET_GetTrackMatrixivNV(exec, _mesa_GetTrackMatrixivNV);
+      SET_GetVertexAttribdvNV(exec, _mesa_GetVertexAttribdvNV);
+      SET_GetVertexAttribfvNV(exec, _mesa_GetVertexAttribfvNV);
+      SET_GetVertexAttribivNV(exec, _mesa_GetVertexAttribivNV);
+      SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervNV);
+      SET_IsProgramNV(exec, _mesa_IsProgramARB);
+      SET_LoadProgramNV(exec, _mesa_LoadProgramNV);
+      SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); /* alias to ProgramParameter4dNV */
+      SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);  /* alias to ProgramParameter4dvNV */
+      SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);  /* alias to ProgramParameter4fNV */
+      SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);  /* alias to ProgramParameter4fvNV */
+      SET_ProgramParameters4dvNV(exec, _mesa_ProgramParameters4dvNV);
+      SET_ProgramParameters4fvNV(exec, _mesa_ProgramParameters4fvNV);
+      SET_TrackMatrixNV(exec, _mesa_TrackMatrixNV);
+      SET_VertexAttribPointerNV(exec, _mesa_VertexAttribPointerNV);
+      /* glVertexAttrib*NV functions handled in api_loopback.c */
+   }
 #endif
 
    /* 273. GL_APPLE_vertex_array_object */
-   SET_BindVertexArrayAPPLE(exec, _mesa_BindVertexArrayAPPLE);
+   if (ctx->API == API_OPENGL) {
+      SET_BindVertexArrayAPPLE(exec, _mesa_BindVertexArrayAPPLE);
+      SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE);
+   }
+   /* Reused by ARB_vertex_array_object */
    SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE);
-   SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE);
    SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE);
 
    /* 282. GL_NV_fragment_program */
 #if FEATURE_NV_fragment_program
-   SET_ProgramNamedParameter4fNV(exec, _mesa_ProgramNamedParameter4fNV);
-   SET_ProgramNamedParameter4dNV(exec, _mesa_ProgramNamedParameter4dNV);
-   SET_ProgramNamedParameter4fvNV(exec, _mesa_ProgramNamedParameter4fvNV);
-   SET_ProgramNamedParameter4dvNV(exec, _mesa_ProgramNamedParameter4dvNV);
-   SET_GetProgramNamedParameterfvNV(exec, _mesa_GetProgramNamedParameterfvNV);
-   SET_GetProgramNamedParameterdvNV(exec, _mesa_GetProgramNamedParameterdvNV);
-   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
-   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
-   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
-   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
-   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
-   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
+   if (ctx->API == API_OPENGL) {
+      SET_ProgramNamedParameter4fNV(exec, _mesa_ProgramNamedParameter4fNV);
+      SET_ProgramNamedParameter4dNV(exec, _mesa_ProgramNamedParameter4dNV);
+      SET_ProgramNamedParameter4fvNV(exec, _mesa_ProgramNamedParameter4fvNV);
+      SET_ProgramNamedParameter4dvNV(exec, _mesa_ProgramNamedParameter4dvNV);
+      SET_GetProgramNamedParameterfvNV(exec, _mesa_GetProgramNamedParameterfvNV);
+      SET_GetProgramNamedParameterdvNV(exec, _mesa_GetProgramNamedParameterdvNV);
+      SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
+      SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
+      SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
+      SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
+      SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
+      SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
+   }
 #endif
 
    /* 262. GL_NV_point_sprite */
@@ -512,7 +527,9 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    /* 268. GL_EXT_stencil_two_side */
 #if _HAVE_FULL_GL
-   SET_ActiveStencilFaceEXT(exec, _mesa_ActiveStencilFaceEXT);
+   if (ctx->API == API_OPENGL) {
+      SET_ActiveStencilFaceEXT(exec, _mesa_ActiveStencilFaceEXT);
+   }
 #endif
 
    /* 285. GL_NV_primitive_restart */
@@ -536,7 +553,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    /* ARB 3. GL_ARB_transpose_matrix */
 #if _HAVE_FULL_GL
-   if (ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       SET_LoadTransposeMatrixdARB(exec, _mesa_LoadTransposeMatrixdARB);
       SET_LoadTransposeMatrixfARB(exec, _mesa_LoadTransposeMatrixfARB);
       SET_MultTransposeMatrixdARB(exec, _mesa_MultTransposeMatrixdARB);
@@ -617,24 +634,26 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB);
    SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB);
    /* glGetVertexAttribPointervARB aliases glGetVertexAttribPointervNV */
-   SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB);
-   SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);
-   SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);
-   SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);
-   SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
-   SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
-   SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
-   SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
-   SET_GetProgramEnvParameterdvARB(exec, _mesa_GetProgramEnvParameterdvARB);
-   SET_GetProgramEnvParameterfvARB(exec, _mesa_GetProgramEnvParameterfvARB);
-   SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
-   SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
+   if (ctx->API == API_OPENGL) {
+      SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB);
+      SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);
+      SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB);
+      SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB);
+      SET_ProgramLocalParameter4dARB(exec, _mesa_ProgramLocalParameter4dARB);
+      SET_ProgramLocalParameter4dvARB(exec, _mesa_ProgramLocalParameter4dvARB);
+      SET_ProgramLocalParameter4fARB(exec, _mesa_ProgramLocalParameter4fARB);
+      SET_ProgramLocalParameter4fvARB(exec, _mesa_ProgramLocalParameter4fvARB);
+      SET_GetProgramEnvParameterdvARB(exec, _mesa_GetProgramEnvParameterdvARB);
+      SET_GetProgramEnvParameterfvARB(exec, _mesa_GetProgramEnvParameterfvARB);
+      SET_GetProgramLocalParameterdvARB(exec, _mesa_GetProgramLocalParameterdvARB);
+      SET_GetProgramLocalParameterfvARB(exec, _mesa_GetProgramLocalParameterfvARB);
+      SET_GetProgramStringARB(exec, _mesa_GetProgramStringARB);
+   }
    SET_GetProgramivARB(exec, _mesa_GetProgramivARB);
-   SET_GetProgramStringARB(exec, _mesa_GetProgramStringARB);
 #endif
 
    /* ARB 28. GL_ARB_vertex_buffer_object */
-   _mesa_init_bufferobj_dispatch(exec);
+   _mesa_init_bufferobj_dispatch(ctx, exec);
 
    /* ARB 29. GL_ARB_occlusion_query */
    _mesa_init_queryobj_dispatch(exec);
@@ -657,13 +676,17 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_ReadnPixelsARB(exec, _mesa_ReadnPixelsARB);
 
   /* GL_ATI_fragment_shader */
-   _mesa_init_ati_fragment_shader_dispatch(exec);
+   if (ctx->API == API_OPENGL) {
+      _mesa_init_ati_fragment_shader_dispatch(exec);
+   }
 
   /* GL_ATI_envmap_bumpmap */
-   SET_GetTexBumpParameterivATI(exec, _mesa_GetTexBumpParameterivATI);
-   SET_GetTexBumpParameterfvATI(exec, _mesa_GetTexBumpParameterfvATI);
-   SET_TexBumpParameterivATI(exec, _mesa_TexBumpParameterivATI);
-   SET_TexBumpParameterfvATI(exec, _mesa_TexBumpParameterfvATI);
+   if (ctx->API == API_OPENGL) {
+      SET_GetTexBumpParameterivATI(exec, _mesa_GetTexBumpParameterivATI);
+      SET_GetTexBumpParameterfvATI(exec, _mesa_GetTexBumpParameterfvATI);
+      SET_TexBumpParameterivATI(exec, _mesa_TexBumpParameterivATI);
+      SET_TexBumpParameterfvATI(exec, _mesa_TexBumpParameterfvATI);
+   }
 
 #if FEATURE_EXT_framebuffer_object
    SET_IsRenderbufferEXT(exec, _mesa_IsRenderbufferEXT);
@@ -691,8 +714,10 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    /* GL_EXT_gpu_program_parameters */
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-   SET_ProgramEnvParameters4fvEXT(exec, _mesa_ProgramEnvParameters4fvEXT);
-   SET_ProgramLocalParameters4fvEXT(exec, _mesa_ProgramLocalParameters4fvEXT);
+   if (ctx->API == API_OPENGL) {
+      SET_ProgramEnvParameters4fvEXT(exec, _mesa_ProgramEnvParameters4fvEXT);
+      SET_ProgramLocalParameters4fvEXT(exec, _mesa_ProgramLocalParameters4fvEXT);
+   }
 #endif
 
    /* GL_MESA_texture_array / GL_EXT_texture_array */
@@ -701,7 +726,9 @@ _mesa_create_exec_table(struct gl_context *ctx)
 #endif
 
    /* GL_ATI_separate_stencil */
-   SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
+   if (ctx->API == API_OPENGL) {
+      SET_StencilFuncSeparateATI(exec, _mesa_StencilFuncSeparateATI);
+   }
 
 #if FEATURE_ARB_framebuffer_object
    /* The ARB_fbo functions are the union of
@@ -800,6 +827,16 @@ _mesa_create_exec_table(struct gl_context *ctx)
    _mesa_init_sampler_object_dispatch(exec);
 #endif
 
+   if (_mesa_is_desktop_gl(ctx)) {
+      SET_InvalidateTexSubImage(exec, _mesa_InvalidateTexSubImage);
+      SET_InvalidateTexImage(exec, _mesa_InvalidateTexImage);
+   }
+
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
+      SET_InvalidateSubFramebuffer(exec, _mesa_InvalidateSubFramebuffer);
+      SET_InvalidateFramebuffer(exec, _mesa_InvalidateFramebuffer);
+   }
+
    return exec;
 }