mesa: simplify dispatch for glDraw* functions

Remove all the glDraw* functions from the GLvertexformat structure.
The point of that dispatch struct is to handle all the functions which
dispatch differently depending on whether we're inside glBegin/End.
glDraw* are never allowed inside glBegin/End so we can remove those
entries.

This simplifies the code paths and gets rid of quite a bit of code.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>

1 files changed, 0 insertions, 43 deletions

diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index a2f4150..db389a5 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -116,49 +116,6 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
       SET_Rectf(tab, vfmt->Rectf);
    }
 
-   if (!beginend) {
-      /* These functions are only valid outside glBegin/glEnd */
-      SET_DrawArrays(tab, vfmt->DrawArrays);
-      SET_DrawElements(tab, vfmt->DrawElements);
-
-      if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
-         SET_DrawRangeElements(tab, vfmt->DrawRangeElements);
-      }
-
-      SET_MultiDrawElementsEXT(tab, vfmt->MultiDrawElementsEXT);
-
-      if (_mesa_is_desktop_gl(ctx)) {
-         SET_DrawElementsBaseVertex(tab, vfmt->DrawElementsBaseVertex);
-         SET_DrawRangeElementsBaseVertex(tab,
-                                         vfmt->DrawRangeElementsBaseVertex);
-         SET_MultiDrawElementsBaseVertex(tab,
-                                         vfmt->MultiDrawElementsBaseVertex);
-         SET_DrawArraysInstancedBaseInstance(tab,
-                                     vfmt->DrawArraysInstancedBaseInstance);
-         SET_DrawElementsInstancedBaseInstance(tab,
-                                   vfmt->DrawElementsInstancedBaseInstance);
-         SET_DrawElementsInstancedBaseVertex(tab,
-                                     vfmt->DrawElementsInstancedBaseVertex);
-         SET_DrawElementsInstancedBaseVertexBaseInstance(tab,
-                         vfmt->DrawElementsInstancedBaseVertexBaseInstance);
-      }
-
-      if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
-         SET_DrawArraysInstancedARB(tab, vfmt->DrawArraysInstanced);
-         SET_DrawElementsInstancedARB(tab, vfmt->DrawElementsInstanced);
-      }
-
-      if (_mesa_is_desktop_gl(ctx)) {
-         SET_DrawTransformFeedback(tab, vfmt->DrawTransformFeedback);
-         SET_DrawTransformFeedbackStream(tab,
-                                         vfmt->DrawTransformFeedbackStream);
-         SET_DrawTransformFeedbackInstanced(tab,
-                                      vfmt->DrawTransformFeedbackInstanced);
-         SET_DrawTransformFeedbackStreamInstanced(tab,
-                                vfmt->DrawTransformFeedbackStreamInstanced);
-      }
-   }
-
    /* Originally for GL_NV_vertex_program, this is also used by dlist.c */
    if (ctx->API == API_OPENGL_COMPAT) {
       SET_VertexAttrib1fNV(tab, vfmt->VertexAttrib1fNV);