diff options
author | Marek Olšák <marek.olsak@amd.com> | 2021-11-29 12:15:07 -0500 |
---|---|---|
committer | Marek Olšák <marek.olsak@amd.com> | 2021-12-14 12:00:16 -0500 |
commit | ac622b85368d636446c6c1dae8daaec0499df614 (patch) | |
tree | d4f31312d0e9037d9eb3765a1e7cfc03cdea5703 | |
parent | 62eba623b5c65ab56fb0b73ff6fecd8a9c1901f4 (diff) |
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>
-rw-r--r-- | src/mesa/main/dlist.c | 2 | ||||
-rw-r--r-- | src/mesa/vbo/vbo.h | 16 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 16 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_init_tmp.h | 16 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_noop.c | 2 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save_api.c | 2 |
6 files changed, 27 insertions, 27 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 2edaffccc5f..92d545a1a89 100644 --- 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 98079208db5..44f1f126c72 100644 --- 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 1cef461824f..435f1043db5 100644 --- 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 2da36adb478..d18f34492a9 100644 --- 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 e74b6500f5b..2cf1352492e 100644 --- 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 e3e7b0d277d..48b8319a9fc 100644 --- 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" } |