From dd6b1ae1109ca8d9994523ec39d2e7d49cb56405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 28 Nov 2021 21:03:14 -0500 Subject: [PATCH] mesa: add EXT suffix to VertexAttribI*EXT to match glapi name I don't wanna do it the other way and potentially break the libGL - *_dri ABI. Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mesa/main/dd.h | 28 ++++++++++++++-------------- src/mesa/main/vtxfmt.c | 28 ++++++++++++++-------------- src/mesa/vbo/vbo_init_tmp.h | 28 ++++++++++++++-------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index d7cc0ecac3b..680e6641e27 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -405,21 +405,21 @@ typedef struct { void (GLAPIENTRYP VertexAttrib4fvES)( GLuint index, const GLfloat *v ); /* GL_EXT_gpu_shader4 / GL 3.0 */ - void (GLAPIENTRYP VertexAttribI1i)( GLuint index, GLint x); - void (GLAPIENTRYP VertexAttribI2i)( GLuint index, GLint x, GLint y); - void (GLAPIENTRYP VertexAttribI3i)( GLuint index, GLint x, GLint y, GLint z); - void (GLAPIENTRYP VertexAttribI4i)( GLuint index, GLint x, GLint y, GLint z, GLint w); - void (GLAPIENTRYP VertexAttribI2iv)( GLuint index, const GLint *v); - void (GLAPIENTRYP VertexAttribI3iv)( GLuint index, const GLint *v); - void (GLAPIENTRYP VertexAttribI4iv)( GLuint index, const GLint *v); + void (GLAPIENTRYP VertexAttribI1iEXT)( GLuint index, GLint x); + void (GLAPIENTRYP VertexAttribI2iEXT)( GLuint index, GLint x, GLint y); + void (GLAPIENTRYP VertexAttribI3iEXT)( GLuint index, GLint x, GLint y, GLint z); + void (GLAPIENTRYP VertexAttribI4iEXT)( GLuint index, GLint x, GLint y, GLint z, GLint w); + void (GLAPIENTRYP VertexAttribI2ivEXT)( GLuint index, const GLint *v); + void (GLAPIENTRYP VertexAttribI3ivEXT)( GLuint index, const GLint *v); + void (GLAPIENTRYP VertexAttribI4ivEXT)( GLuint index, const GLint *v); - void (GLAPIENTRYP VertexAttribI1ui)( GLuint index, GLuint x); - void (GLAPIENTRYP VertexAttribI2ui)( GLuint index, GLuint x, GLuint y); - void (GLAPIENTRYP VertexAttribI3ui)( GLuint index, GLuint x, GLuint y, GLuint z); - void (GLAPIENTRYP VertexAttribI4ui)( GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); - void (GLAPIENTRYP VertexAttribI2uiv)( GLuint index, const GLuint *v); - void (GLAPIENTRYP VertexAttribI3uiv)( GLuint index, const GLuint *v); - void (GLAPIENTRYP VertexAttribI4uiv)( GLuint index, const GLuint *v); + void (GLAPIENTRYP VertexAttribI1uiEXT)( GLuint index, GLuint x); + void (GLAPIENTRYP VertexAttribI2uiEXT)( GLuint index, GLuint x, GLuint y); + void (GLAPIENTRYP VertexAttribI3uiEXT)( GLuint index, GLuint x, GLuint y, GLuint z); + void (GLAPIENTRYP VertexAttribI4uiEXT)( GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); + void (GLAPIENTRYP VertexAttribI2uivEXT)( GLuint index, const GLuint *v); + void (GLAPIENTRYP VertexAttribI3uivEXT)( GLuint index, const GLuint *v); + void (GLAPIENTRYP VertexAttribI4uivEXT)( GLuint index, const GLuint *v); /* GL_ARB_vertex_type_10_10_10_2_rev / GL3.3 */ void (GLAPIENTRYP VertexP2ui)( GLenum type, GLuint value ); diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c index 9a04d55e59a..9ed295fa25a 100644 --- a/src/mesa/main/vtxfmt.c +++ b/src/mesa/main/vtxfmt.c @@ -150,24 +150,24 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab, /* GL_EXT_gpu_shader4 / OpenGL 3.0 */ if (_mesa_is_desktop_gl(ctx)) { - SET_VertexAttribI1iEXT(tab, vfmt->VertexAttribI1i); - SET_VertexAttribI2iEXT(tab, vfmt->VertexAttribI2i); - SET_VertexAttribI3iEXT(tab, vfmt->VertexAttribI3i); - SET_VertexAttribI2ivEXT(tab, vfmt->VertexAttribI2iv); - SET_VertexAttribI3ivEXT(tab, vfmt->VertexAttribI3iv); + SET_VertexAttribI1iEXT(tab, vfmt->VertexAttribI1iEXT); + SET_VertexAttribI2iEXT(tab, vfmt->VertexAttribI2iEXT); + SET_VertexAttribI3iEXT(tab, vfmt->VertexAttribI3iEXT); + SET_VertexAttribI2ivEXT(tab, vfmt->VertexAttribI2ivEXT); + SET_VertexAttribI3ivEXT(tab, vfmt->VertexAttribI3ivEXT); - SET_VertexAttribI1uiEXT(tab, vfmt->VertexAttribI1ui); - SET_VertexAttribI2uiEXT(tab, vfmt->VertexAttribI2ui); - SET_VertexAttribI3uiEXT(tab, vfmt->VertexAttribI3ui); - SET_VertexAttribI2uivEXT(tab, vfmt->VertexAttribI2uiv); - SET_VertexAttribI3uivEXT(tab, vfmt->VertexAttribI3uiv); + SET_VertexAttribI1uiEXT(tab, vfmt->VertexAttribI1uiEXT); + SET_VertexAttribI2uiEXT(tab, vfmt->VertexAttribI2uiEXT); + SET_VertexAttribI3uiEXT(tab, vfmt->VertexAttribI3uiEXT); + SET_VertexAttribI2uivEXT(tab, vfmt->VertexAttribI2uivEXT); + SET_VertexAttribI3uivEXT(tab, vfmt->VertexAttribI3uivEXT); } if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_VertexAttribI4iEXT(tab, vfmt->VertexAttribI4i); - SET_VertexAttribI4ivEXT(tab, vfmt->VertexAttribI4iv); - SET_VertexAttribI4uiEXT(tab, vfmt->VertexAttribI4ui); - SET_VertexAttribI4uivEXT(tab, vfmt->VertexAttribI4uiv); + SET_VertexAttribI4iEXT(tab, vfmt->VertexAttribI4iEXT); + SET_VertexAttribI4ivEXT(tab, vfmt->VertexAttribI4ivEXT); + SET_VertexAttribI4uiEXT(tab, vfmt->VertexAttribI4uiEXT); + SET_VertexAttribI4uivEXT(tab, vfmt->VertexAttribI4uivEXT); } if (ctx->API == API_OPENGL_COMPAT) { diff --git a/src/mesa/vbo/vbo_init_tmp.h b/src/mesa/vbo/vbo_init_tmp.h index 445cf3455fe..50064711b0c 100644 --- a/src/mesa/vbo/vbo_init_tmp.h +++ b/src/mesa/vbo/vbo_init_tmp.h @@ -152,22 +152,22 @@ vfmt->VertexAttrib4fNV = NAME(VertexAttrib4fNV); vfmt->VertexAttrib4fvNV = NAME(VertexAttrib4fvNV); /* integer-valued */ -vfmt->VertexAttribI1i = NAME(VertexAttribI1i); -vfmt->VertexAttribI2i = NAME(VertexAttribI2i); -vfmt->VertexAttribI3i = NAME(VertexAttribI3i); -vfmt->VertexAttribI4i = NAME(VertexAttribI4i); -vfmt->VertexAttribI2iv = NAME(VertexAttribI2iv); -vfmt->VertexAttribI3iv = NAME(VertexAttribI3iv); -vfmt->VertexAttribI4iv = NAME(VertexAttribI4iv); +vfmt->VertexAttribI1iEXT = NAME(VertexAttribI1i); +vfmt->VertexAttribI2iEXT = NAME(VertexAttribI2i); +vfmt->VertexAttribI3iEXT = NAME(VertexAttribI3i); +vfmt->VertexAttribI4iEXT = NAME(VertexAttribI4i); +vfmt->VertexAttribI2ivEXT = NAME(VertexAttribI2iv); +vfmt->VertexAttribI3ivEXT = NAME(VertexAttribI3iv); +vfmt->VertexAttribI4ivEXT = NAME(VertexAttribI4iv); /* unsigned integer-valued */ -vfmt->VertexAttribI1ui = NAME(VertexAttribI1ui); -vfmt->VertexAttribI2ui = NAME(VertexAttribI2ui); -vfmt->VertexAttribI3ui = NAME(VertexAttribI3ui); -vfmt->VertexAttribI4ui = NAME(VertexAttribI4ui); -vfmt->VertexAttribI2uiv = NAME(VertexAttribI2uiv); -vfmt->VertexAttribI3uiv = NAME(VertexAttribI3uiv); -vfmt->VertexAttribI4uiv = NAME(VertexAttribI4uiv); +vfmt->VertexAttribI1uiEXT = NAME(VertexAttribI1ui); +vfmt->VertexAttribI2uiEXT = NAME(VertexAttribI2ui); +vfmt->VertexAttribI3uiEXT = NAME(VertexAttribI3ui); +vfmt->VertexAttribI4uiEXT = NAME(VertexAttribI4ui); +vfmt->VertexAttribI2uivEXT = NAME(VertexAttribI2uiv); +vfmt->VertexAttribI3uivEXT = NAME(VertexAttribI3uiv); +vfmt->VertexAttribI4uivEXT = NAME(VertexAttribI4uiv); vfmt->Materialfv = NAME(Materialfv);