diff options
| author | Michel Zou <xantares09@hotmail.com> | 2021-06-05 09:27:02 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-06-10 10:31:55 +0000 |
| commit | 30115d0038d3977ad1d5c62d5804d5fe6d6f9535 (patch) | |
| tree | d89b302d4a83a5023e760e3536e40732caf809a9 | |
| parent | 18337fbcf2123703ff6a5186b46d2ec8ca2c8dc7 (diff) | |
glapi: fix Warray-parameter
Fixes these new gcc11 warnings:
In file included from ../src/mapi/glapi/glapi_dispatch.c:174:
src/mapi/glapi/gen/glapitemp.h:3191:68: warning: argument 1 of type 'const GLdouble *' {aka 'const double *'} declared as a pointer [-Warray-parameter=]
3191 | KEYWORD1 void KEYWORD2 NAME(LoadTransposeMatrixd)(const GLdouble * m)
| ~~~~~~~~~~~~~~~~~^
In file included from ../src/mapi/glapi/glapi_priv.h:31,
from ../src/mapi/glapi/glapi_dispatch.c:40:
../include/GL/gl.h:1901:62: note: previously declared as an array 'const GLdouble[16]' {aka 'const double[16]'}
1901 | GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble m[16] );
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11198>
| -rw-r--r-- | include/GL/gl.h | 8 | ||||
| -rw-r--r-- | src/mapi/glapi/glapi_dispatch.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index 2518dfbb40d..191560ef640 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -1898,13 +1898,13 @@ GLAPI void GLAPIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GL GLAPI void GLAPIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v ); -GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble m[16] ); +GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble * m ); -GLAPI void GLAPIENTRY glLoadTransposeMatrixf( const GLfloat m[16] ); +GLAPI void GLAPIENTRY glLoadTransposeMatrixf( const GLfloat * m ); -GLAPI void GLAPIENTRY glMultTransposeMatrixd( const GLdouble m[16] ); +GLAPI void GLAPIENTRY glMultTransposeMatrixd( const GLdouble * m ); -GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] ); +GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat * m ); GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert ); diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c index fa59705fbe4..b462c4af93e 100644 --- a/src/mapi/glapi/glapi_dispatch.c +++ b/src/mapi/glapi/glapi_dispatch.c @@ -103,7 +103,7 @@ GL_API void GL_APIENTRY glClearDepthf (GLclampf depth); GL_API void GL_APIENTRY glClipPlanef (GLenum plane, const GLfloat *equation); GL_API void GL_APIENTRY glFrustumf (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); -GL_API void GL_APIENTRY glGetClipPlanef (GLenum pname, GLfloat eqn[4]); +GL_API void GL_APIENTRY glGetClipPlanef (GLenum pname, GLfloat *equation); GL_API void GL_APIENTRY glOrthof (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); GL_API void GL_APIENTRY glAlphaFuncx (GLenum func, GLclampx ref); @@ -115,7 +115,7 @@ GL_API void GL_APIENTRY glDepthRangex (GLclampx zNear, GLclampx zFar); GL_API void GL_APIENTRY glFogx (GLenum pname, GLfixed param); GL_API void GL_APIENTRY glFogxv (GLenum pname, const GLfixed *params); GL_API void GL_APIENTRY glFrustumx (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); -GL_API void GL_APIENTRY glGetClipPlanex (GLenum pname, GLfixed eqn[4]); +GL_API void GL_APIENTRY glGetClipPlanex (GLenum pname, GLfixed *equation); GL_API void GL_APIENTRY glGetFixedv (GLenum pname, GLfixed *params); GL_API void GL_APIENTRY glGetLightxv (GLenum light, GLenum pname, GLfixed *params); GL_API void GL_APIENTRY glGetMaterialxv (GLenum face, GLenum pname, GLfixed *params); |