mesa: remove redundant api_loopback functions

vbo_attrib_tmp.h implements them, so this loopback code isn't needed
and shouldn't be used.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4123>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4123>

diff --git a/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml b/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml
index f75387bf8fea78b90d2089e5a6323598b42d80ad..1342e7e777ed07861a361361442bcc30477ec7cb 100644 (file)
--- a/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml
+++ b/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml
@@ -5,25 +5,25 @@
 
 <category name="GL_ARB_vertex_attrib_64bit" number="99">
 
-    <function name="VertexAttribL1d">
+    <function name="VertexAttribL1d" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttribL2d">
+    <function name="VertexAttribL2d" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttribL3d">
+    <function name="VertexAttribL3d" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttribL4d">
+    <function name="VertexAttribL4d" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
@@ -31,22 +31,22 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttribL1dv">
+    <function name="VertexAttribL1dv" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="1"/>
     </function>
 
-    <function name="VertexAttribL2dv">
+    <function name="VertexAttribL2dv" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="2"/>
     </function>
 
-    <function name="VertexAttribL3dv">
+    <function name="VertexAttribL3dv" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="3"/>
     </function>
 
-    <function name="VertexAttribL4dv">
+    <function name="VertexAttribL4dv" exec="dynamic">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="4"/>
     </function>

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 19b2dea482178abfe488dda7ae7ea84260da2999..b8453cb37426b76bf7f1f40ad6558e9ffd8947bb 100644 (file)
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2497,7 +2497,7 @@
         <param name="u" type="GLfloat"/>
     </function>
 
-    <function name="EvalCoord1fv" deprecated="3.1">
+    <function name="EvalCoord1fv" deprecated="3.1" exec="dynamic">
         <param name="u" type="const GLfloat *" count="1"/>
         <glx rop="152"/>
     </function>
@@ -2518,7 +2518,7 @@
         <param name="v" type="GLfloat"/>
     </function>
 
-    <function name="EvalCoord2fv" deprecated="3.1">
+    <function name="EvalCoord2fv" deprecated="3.1" exec="dynamic">
         <param name="u" type="const GLfloat *" count="2"/>
         <glx rop="154"/>
     </function>

diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 53873eae29e42d9cdc0ff52785e8a37f37699c6b..ba4b1995765e9c400dfaee92be71a154b81088fb 100644 (file)
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -84,13 +84,6 @@
 
 #define ATTRIBI_4UI(index,x,y,z,w)   CALL_VertexAttribI4uiEXT(GET_DISPATCH(), (index,x,y,z,w))
 
-#define ATTRIB1_D(index,x)         CALL_VertexAttribL1d(GET_DISPATCH(), (index,x))
-#define ATTRIB2_D(index,x,y)       CALL_VertexAttribL2d(GET_DISPATCH(), (index,x,y))
-#define ATTRIB3_D(index,x,y,z)     CALL_VertexAttribL3d(GET_DISPATCH(), (index,x,y,z))
-#define ATTRIB4_D(index,x,y,z,w)    CALL_VertexAttribL4d(GET_DISPATCH(), (index,x,y,z,w))
-
-#define ATTRIB1_UI64(index, x)     CALL_VertexAttribL1ui64ARB(GET_DISPATCH(), (index, x))
-
 void GLAPIENTRY
 _mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue )
 {
@@ -823,12 +816,6 @@ _mesa_EvalCoord2dv( const GLdouble *u )
    EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] );
 }
 
-void GLAPIENTRY
-_mesa_EvalCoord2fv( const GLfloat *u )
-{
-   EVALCOORD2( u[0], u[1] );
-}
-
 void GLAPIENTRY
 _mesa_EvalCoord2d( GLdouble u, GLdouble v )
 {
@@ -841,12 +828,6 @@ _mesa_EvalCoord1dv( const GLdouble *u )
    EVALCOORD1( (GLfloat) *u );
 }
 
-void GLAPIENTRY
-_mesa_EvalCoord1fv( const GLfloat *u )
-{
-   EVALCOORD1( (GLfloat) *u );
-}
-
 void GLAPIENTRY
 _mesa_EvalCoord1d( GLdouble u )
 {
@@ -1497,66 +1478,6 @@ _mesa_VertexAttribI4usv(GLuint index, const GLushort *v)
    ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]);
 }
 
-void GLAPIENTRY
-_mesa_VertexAttribL1d(GLuint index, GLdouble x)
-{
-   ATTRIB1_D(index, x);
-}
-
-void GLAPIENTRY
-_mesa_VertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
-{
-   ATTRIB2_D(index, x, y);
-}
-
-void GLAPIENTRY
-_mesa_VertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
-{
-   ATTRIB3_D(index, x, y, z);
-}
-
-void GLAPIENTRY
-_mesa_VertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-   ATTRIB4_D(index, x, y, z, w);
-}
-
-void GLAPIENTRY
-_mesa_VertexAttribL1dv(GLuint index, const GLdouble *v)
-{
-   ATTRIB1_D(index, v[0]);
-}
-
-void GLAPIENTRY
-_mesa_VertexAttribL1ui64ARB(GLuint index, GLuint64EXT x)
-{
-   ATTRIB1_UI64(index, x);
-}
-
-void GLAPIENTRY
-_mesa_VertexAttribL1ui64vARB(GLuint index, const GLuint64EXT *v)
-{
-   ATTRIB1_UI64(index, v[0]);
-}
-
-void GLAPIENTRY
-_mesa_VertexAttribL2dv(GLuint index, const GLdouble *v)
-{
-   ATTRIB2_D(index, v[0], v[1]);
-}
-
-void GLAPIENTRY
-_mesa_VertexAttribL3dv(GLuint index, const GLdouble *v)
-{
-   ATTRIB3_D(index, v[0], v[1], v[2]);
-}
-
-void GLAPIENTRY
-_mesa_VertexAttribL4dv(GLuint index, const GLdouble *v)
-{
-   ATTRIB4_D(index, v[0], v[1], v[2], v[3]);
-}
-
 /*
  * This code never registers handlers for any of the entry points
  * listed in vtxfmt.h.
@@ -1698,10 +1619,8 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
       SET_MultiTexCoord4s(dest, _mesa_MultiTexCoord4s);
       SET_MultiTexCoord4sv(dest, _mesa_MultiTexCoord4sv);
       SET_EvalCoord2dv(dest, _mesa_EvalCoord2dv);
-      SET_EvalCoord2fv(dest, _mesa_EvalCoord2fv);
       SET_EvalCoord2d(dest, _mesa_EvalCoord2d);
       SET_EvalCoord1dv(dest, _mesa_EvalCoord1dv);
-      SET_EvalCoord1fv(dest, _mesa_EvalCoord1fv);
       SET_EvalCoord1d(dest, _mesa_EvalCoord1d);
       SET_Materiali(dest, _mesa_Materiali);
       SET_Materialiv(dest, _mesa_Materialiv);

diff --git a/src/mesa/main/api_loopback.h b/src/mesa/main/api_loopback.h
index c1e7b24f0926f096eab31b6fa8fb94f5ba1623b5..272c7e57b0350451c9092ec8244b6e72704b470e 100644 (file)
--- a/src/mesa/main/api_loopback.h
+++ b/src/mesa/main/api_loopback.h
@@ -270,14 +270,10 @@ _mesa_MultiTexCoord4sv(GLenum target, const GLshort *v);
 void GLAPIENTRY
 _mesa_EvalCoord2dv( const GLdouble *u );
 void GLAPIENTRY
-_mesa_EvalCoord2fv( const GLfloat *u );
-void GLAPIENTRY
 _mesa_EvalCoord2d( GLdouble u, GLdouble v );
 void GLAPIENTRY
 _mesa_EvalCoord1dv( const GLdouble *u );
 void GLAPIENTRY
-_mesa_EvalCoord1fv( const GLfloat *u );
-void GLAPIENTRY
 _mesa_EvalCoord1d( GLdouble u );
 void GLAPIENTRY
 _mesa_Materialf( GLenum face, GLenum pname, GLfloat param );
@@ -464,27 +460,4 @@ _mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v);
 void GLAPIENTRY
 _mesa_VertexAttribI4usv(GLuint index, const GLushort *v);
 
-void GLAPIENTRY
-_mesa_VertexAttribL1d(GLuint index, GLdouble x);
-void GLAPIENTRY
-_mesa_VertexAttribL2d(GLuint index, GLdouble x, GLdouble y);
-void GLAPIENTRY
-_mesa_VertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z);
-void GLAPIENTRY
-_mesa_VertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-
-void GLAPIENTRY
-_mesa_VertexAttribL1dv(GLuint index, const GLdouble *v);
-void GLAPIENTRY
-_mesa_VertexAttribL2dv(GLuint index, const GLdouble *v);
-void GLAPIENTRY
-_mesa_VertexAttribL3dv(GLuint index, const GLdouble *v);
-void GLAPIENTRY
-_mesa_VertexAttribL4dv(GLuint index, const GLdouble *v);
-
-void GLAPIENTRY
-_mesa_VertexAttribL1ui64ARB(GLuint index, GLuint64EXT x);
-void GLAPIENTRY
-_mesa_VertexAttribL1ui64vARB(GLuint index, const GLuint64EXT *v);
-
 #endif /* API_LOOPBACK_H */