mesa: remove GLvertexformat::EvalMesh1(), EvalMesh2()

See previous commit comments.

Reviewed-by: Jose Fonseca <[email protected]>

5 files changed, 3 insertions, 30 deletions

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index e3240a26f8f..4c76fa49616 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1019,22 +1019,6 @@ typedef struct {
    void (GLAPIENTRYP VertexAttribP4uiv)( GLuint index, GLenum type,
 					 GLboolean normalized,
 					 const GLuint *value);
-
-   /*@}*/
-
-   /**
-    * \name Eval
-    *
-    * If you don't support eval, fallback to the default vertex format
-    * on receiving an eval call and use the pipeline mechanism to
-    * provide partial T&L acceleration.
-    *
-    * Mesa will provide a set of helper functions to do eval within
-    * accelerated vertex formats, eventually...
-    */
-   /*@{*/
-   void (GLAPIENTRYP EvalMesh1)( GLenum mode, GLint i1, GLint i2 );
-   void (GLAPIENTRYP EvalMesh2)( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
    /*@}*/
 
 } GLvertexformat;
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index ae2a5529606..c37b15ee64b 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -9592,8 +9592,6 @@ save_vtxfmt_init(GLvertexformat * vfmt)
    vfmt->EvalCoord2fv = save_EvalCoord2fv;
    vfmt->EvalPoint1 = save_EvalPoint1;
    vfmt->EvalPoint2 = save_EvalPoint2;
-   vfmt->EvalMesh1 = save_EvalMesh1;
-   vfmt->EvalMesh2 = save_EvalMesh2;
 
    vfmt->FogCoordfEXT = save_FogCoordfEXT;
    vfmt->FogCoordfvEXT = save_FogCoordfvEXT;
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index 4b6d63c697b..349331f0002 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -824,8 +824,7 @@ _mesa_MapGrid2d( GLint un, GLdouble u1, GLdouble u2,
 
 void
 _mesa_install_eval_vtxfmt(struct _glapi_table *disp,
-                          const GLvertexformat *vfmt,
-                          bool beginend)
+                          const GLvertexformat *vfmt)
 {
    SET_EvalCoord1f(disp, vfmt->EvalCoord1f);
    SET_EvalCoord1fv(disp, vfmt->EvalCoord1fv);
@@ -833,13 +832,6 @@ _mesa_install_eval_vtxfmt(struct _glapi_table *disp,
    SET_EvalCoord2fv(disp, vfmt->EvalCoord2fv);
    SET_EvalPoint1(disp, vfmt->EvalPoint1);
    SET_EvalPoint2(disp, vfmt->EvalPoint2);
-
-   /* glEvalMesh1 and glEvalMesh2 are not allowed between glBegin and glEnd.
-    */
-   if (!beginend) {
-      SET_EvalMesh1(disp, vfmt->EvalMesh1);
-      SET_EvalMesh2(disp, vfmt->EvalMesh2);
-   }
 }
 
 
diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h
index 9b6358b0cac..33240f00d33 100644
--- a/src/mesa/main/eval.h
+++ b/src/mesa/main/eval.h
@@ -65,8 +65,7 @@ extern GLfloat *_mesa_copy_map_points2d(GLenum target,
 
 extern void
 _mesa_install_eval_vtxfmt(struct _glapi_table *disp,
-                          const GLvertexformat *vfmt,
-                          bool beginend);
+                          const GLvertexformat *vfmt);
 
 extern void _mesa_init_eval( struct gl_context *ctx );
 extern void _mesa_free_eval_data( struct gl_context *ctx );
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 3a0e7d357ee..d7bf98ec8ec 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -63,7 +63,7 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
    }
 
    if (ctx->API == API_OPENGL_COMPAT) {
-      _mesa_install_eval_vtxfmt(tab, vfmt, beginend);
+      _mesa_install_eval_vtxfmt(tab, vfmt);
    }
 
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {