vbo: rename ES vertex functions to match GL dispatch names

vbo_init_tmp.h will be autogenerated.

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

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 2edaffc..92d545a 100644 (file)
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -15094,7 +15094,7 @@ _mesa_init_display_list(struct gl_context *ctx)
 #define NAME_AE(x) _ae_##x
 #define NAME_CALLLIST(x) save_##x
 #define NAME(x) save_##x
-#define NAME_ES(x) save_##x##ARB
+#define NAME_ES(x) save_##x
 
 #include "vbo/vbo_init_tmp.h"
 }

diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h
index 9807920..44f1f12 100644 (file)
--- a/src/mesa/vbo/vbo.h
+++ b/src/mesa/vbo/vbo.h
@@ -249,28 +249,28 @@ void GLAPIENTRY
 _es_Materialf(GLenum face, GLenum pname, GLfloat param);
 
 void GLAPIENTRY
-_es_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+_es_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
 
 void GLAPIENTRY
-_es_VertexAttrib1f(GLuint indx, GLfloat x);
+_es_VertexAttrib1fARB(GLuint indx, GLfloat x);
 
 void GLAPIENTRY
-_es_VertexAttrib1fv(GLuint indx, const GLfloat* values);
+_es_VertexAttrib1fvARB(GLuint indx, const GLfloat* values);
 
 void GLAPIENTRY
-_es_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
+_es_VertexAttrib2fARB(GLuint indx, GLfloat x, GLfloat y);
 
 void GLAPIENTRY
-_es_VertexAttrib2fv(GLuint indx, const GLfloat* values);
+_es_VertexAttrib2fvARB(GLuint indx, const GLfloat* values);
 
 void GLAPIENTRY
-_es_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
+_es_VertexAttrib3fARB(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
 
 void GLAPIENTRY
-_es_VertexAttrib3fv(GLuint indx, const GLfloat* values);
+_es_VertexAttrib3fvARB(GLuint indx, const GLfloat* values);
 
 void GLAPIENTRY
-_es_VertexAttrib4fv(GLuint indx, const GLfloat* values);
+_es_VertexAttrib4fvARB(GLuint indx, const GLfloat* values);
 
 void GLAPIENTRY
 save_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);

diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 1cef461..435f104 100644 (file)
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -1169,56 +1169,56 @@ VertexAttrib4f_nopos(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 }
 
 void GLAPIENTRY
-_es_VertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+_es_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    VertexAttrib4f_nopos(index, x, y, z, w);
 }
 
 
 void GLAPIENTRY
-_es_VertexAttrib1f(GLuint indx, GLfloat x)
+_es_VertexAttrib1fARB(GLuint indx, GLfloat x)
 {
    VertexAttrib4f_nopos(indx, x, 0.0f, 0.0f, 1.0f);
 }
 
 
 void GLAPIENTRY
-_es_VertexAttrib1fv(GLuint indx, const GLfloat* values)
+_es_VertexAttrib1fvARB(GLuint indx, const GLfloat* values)
 {
    VertexAttrib4f_nopos(indx, values[0], 0.0f, 0.0f, 1.0f);
 }
 
 
 void GLAPIENTRY
-_es_VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
+_es_VertexAttrib2fARB(GLuint indx, GLfloat x, GLfloat y)
 {
    VertexAttrib4f_nopos(indx, x, y, 0.0f, 1.0f);
 }
 
 
 void GLAPIENTRY
-_es_VertexAttrib2fv(GLuint indx, const GLfloat* values)
+_es_VertexAttrib2fvARB(GLuint indx, const GLfloat* values)
 {
    VertexAttrib4f_nopos(indx, values[0], values[1], 0.0f, 1.0f);
 }
 
 
 void GLAPIENTRY
-_es_VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
+_es_VertexAttrib3fARB(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
 {
    VertexAttrib4f_nopos(indx, x, y, z, 1.0f);
 }
 
 
 void GLAPIENTRY
-_es_VertexAttrib3fv(GLuint indx, const GLfloat* values)
+_es_VertexAttrib3fvARB(GLuint indx, const GLfloat* values)
 {
    VertexAttrib4f_nopos(indx, values[0], values[1], values[2], 1.0f);
 }
 
 
 void GLAPIENTRY
-_es_VertexAttrib4fv(GLuint indx, const GLfloat* values)
+_es_VertexAttrib4fvARB(GLuint indx, const GLfloat* values)
 {
    VertexAttrib4f_nopos(indx, values[0], values[1], values[2], values[3]);
 }

diff --git a/src/mesa/vbo/vbo_init_tmp.h b/src/mesa/vbo/vbo_init_tmp.h
index 2da36ad..d18f344 100644 (file)
--- a/src/mesa/vbo/vbo_init_tmp.h
+++ b/src/mesa/vbo/vbo_init_tmp.h
@@ -74,14 +74,14 @@ vfmt->Vertex3fv = NAME(Vertex3fv);
 vfmt->Vertex4f = NAME(Vertex4f);
 vfmt->Vertex4fv = NAME(Vertex4fv);
 
-vfmt->VertexAttrib1fES = NAME_ES(VertexAttrib1f);
-vfmt->VertexAttrib1fvES = NAME_ES(VertexAttrib1fv);
-vfmt->VertexAttrib2fES = NAME_ES(VertexAttrib2f);
-vfmt->VertexAttrib2fvES = NAME_ES(VertexAttrib2fv);
-vfmt->VertexAttrib3fES = NAME_ES(VertexAttrib3f);
-vfmt->VertexAttrib3fvES = NAME_ES(VertexAttrib3fv);
-vfmt->VertexAttrib4fES = NAME_ES(VertexAttrib4f);
-vfmt->VertexAttrib4fvES = NAME_ES(VertexAttrib4fv);
+vfmt->VertexAttrib1fES = NAME_ES(VertexAttrib1fARB);
+vfmt->VertexAttrib1fvES = NAME_ES(VertexAttrib1fvARB);
+vfmt->VertexAttrib2fES = NAME_ES(VertexAttrib2fARB);
+vfmt->VertexAttrib2fvES = NAME_ES(VertexAttrib2fvARB);
+vfmt->VertexAttrib3fES = NAME_ES(VertexAttrib3fARB);
+vfmt->VertexAttrib3fvES = NAME_ES(VertexAttrib3fvARB);
+vfmt->VertexAttrib4fES = NAME_ES(VertexAttrib4fARB);
+vfmt->VertexAttrib4fvES = NAME_ES(VertexAttrib4fvARB);
 
 vfmt->VertexAttrib1fARB = NAME(VertexAttrib1fARB);
 vfmt->VertexAttrib1fvARB = NAME(VertexAttrib1fvARB);

diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c
index e74b650..2cf1352 100644 (file)
--- a/src/mesa/vbo/vbo_noop.c
+++ b/src/mesa/vbo/vbo_noop.c
@@ -125,7 +125,7 @@ _mesa_noop_vtxfmt_init(struct gl_context *ctx, GLvertexformat * vfmt)
 #define NAME_AE(x) _mesa_noop_##x
 #define NAME_CALLLIST(x) _mesa_##x
 #define NAME(x) _mesa_noop_##x
-#define NAME_ES(x) _mesa_noop_##x##ARB
+#define NAME_ES(x) _mesa_noop_##x
 
 #include "vbo_init_tmp.h"
 }

diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index e3e7b0d..48b8319 100644 (file)
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1930,7 +1930,7 @@ vtxfmt_init(struct gl_context *ctx)
 #define NAME_AE(x) _ae_##x
 #define NAME_CALLLIST(x) _save_##x
 #define NAME(x) _save_##x
-#define NAME_ES(x) _save_##x##ARB
+#define NAME_ES(x) _save_##x
 
 #include "vbo_init_tmp.h"
 }