From 3bfc6c2c8756d2e808defe5e6e9bfd6b77677684 Mon Sep 17 00:00:00 2001 From: tdcosta100 Date: Thu, 19 Jan 2023 08:09:58 -0300 Subject: [PATCH] Make pointer to glGetString function const (#708) --- include/mbgl/platform/gl_functions.hpp | 2 +- platform/android/src/gl_functions.cpp | 2 +- platform/darwin/src/gl_functions.cpp | 2 +- platform/linux/src/gl_functions.cpp | 2 +- platform/qt/src/mbgl/gl_functions.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/mbgl/platform/gl_functions.hpp b/include/mbgl/platform/gl_functions.hpp index b617b3561..920e7c625 100644 --- a/include/mbgl/platform/gl_functions.hpp +++ b/include/mbgl/platform/gl_functions.hpp @@ -175,7 +175,7 @@ extern void (* const glGetShaderiv)(GLuint, GLenum, GLint *); /// Pointer to glGetShaderSource OpenGL function. extern void (* const glGetShaderSource)(GLuint, GLsizei, GLsizei *, GLchar *); /// Pointer to glGetString OpenGL function. -extern const GLubyte *(*glGetString)(GLenum); +extern const GLubyte *(* const glGetString)(GLenum); /// Pointer to glGetTexParameterfv OpenGL function. extern void (* const glGetTexParameterfv)(GLenum, GLenum, GLfloat *); /// Pointer to glGetTexParameteriv OpenGL function. diff --git a/platform/android/src/gl_functions.cpp b/platform/android/src/gl_functions.cpp index 637788e4a..90be88b0a 100644 --- a/platform/android/src/gl_functions.cpp +++ b/platform/android/src/gl_functions.cpp @@ -77,7 +77,7 @@ void (* const glGetRenderbufferParameteriv)(GLenum, GLenum, GLint *) = ::glGetRe void (* const glGetShaderInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *) = ::glGetShaderInfoLog; void (* const glGetShaderiv)(GLuint, GLenum, GLint *) = ::glGetShaderiv; void (* const glGetShaderSource)(GLuint, GLsizei, GLsizei *, GLchar *) = ::glGetShaderSource; -const GLubyte *(*glGetString)(GLenum) = ::glGetString; +const GLubyte *(* const glGetString)(GLenum) = ::glGetString; void (* const glGetTexParameterfv)(GLenum, GLenum, GLfloat *) = ::glGetTexParameterfv; void (* const glGetTexParameteriv)(GLenum, GLenum, GLint *) = ::glGetTexParameteriv; void (* const glGetUniformfv)(GLuint, GLint, GLfloat *) = ::glGetUniformfv; diff --git a/platform/darwin/src/gl_functions.cpp b/platform/darwin/src/gl_functions.cpp index b8828d311..a0da6f3e0 100644 --- a/platform/darwin/src/gl_functions.cpp +++ b/platform/darwin/src/gl_functions.cpp @@ -97,7 +97,7 @@ void (* const glGetRenderbufferParameteriv)(GLenum, GLenum, GLint *) = ::glGetRe void (* const glGetShaderInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *) = ::glGetShaderInfoLog; void (* const glGetShaderiv)(GLuint, GLenum, GLint *) = ::glGetShaderiv; void (* const glGetShaderSource)(GLuint, GLsizei, GLsizei *, GLchar *) = ::glGetShaderSource; -const GLubyte *(*glGetString)(GLenum) = ::glGetString; +const GLubyte *(* const glGetString)(GLenum) = ::glGetString; void (* const glGetTexParameterfv)(GLenum, GLenum, GLfloat *) = ::glGetTexParameterfv; void (* const glGetTexParameteriv)(GLenum, GLenum, GLint *) = ::glGetTexParameteriv; void (* const glGetUniformfv)(GLuint, GLint, GLfloat *) = ::glGetUniformfv; diff --git a/platform/linux/src/gl_functions.cpp b/platform/linux/src/gl_functions.cpp index a5c752793..bf88f46c6 100644 --- a/platform/linux/src/gl_functions.cpp +++ b/platform/linux/src/gl_functions.cpp @@ -83,7 +83,7 @@ void (* const glGetRenderbufferParameteriv)(GLenum, GLenum, GLint *) = ::glGetRe void (* const glGetShaderInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *) = ::glGetShaderInfoLog; void (* const glGetShaderiv)(GLuint, GLenum, GLint *) = ::glGetShaderiv; void (* const glGetShaderSource)(GLuint, GLsizei, GLsizei *, GLchar *) = ::glGetShaderSource; -const GLubyte *(*glGetString)(GLenum) = ::glGetString; +const GLubyte *(* const glGetString)(GLenum) = ::glGetString; void (* const glGetTexParameterfv)(GLenum, GLenum, GLfloat *) = ::glGetTexParameterfv; void (* const glGetTexParameteriv)(GLenum, GLenum, GLint *) = ::glGetTexParameteriv; void (* const glGetUniformfv)(GLuint, GLint, GLfloat *) = ::glGetUniformfv; diff --git a/platform/qt/src/mbgl/gl_functions.cpp b/platform/qt/src/mbgl/gl_functions.cpp index b9f1ac26d..d14aae45b 100644 --- a/platform/qt/src/mbgl/gl_functions.cpp +++ b/platform/qt/src/mbgl/gl_functions.cpp @@ -286,7 +286,7 @@ void (* const glGetShaderSource)(GLuint, GLsizei, GLsizei *, GLchar *) = [](auto return QOpenGLContext::currentContext()->functions()->glGetShaderSource(args...); }; -const GLubyte *(*glGetString)(GLenum) = [](auto... args) { +const GLubyte *(* const glGetString)(GLenum) = [](auto... args) { return QOpenGLContext::currentContext()->functions()->glGetString(args...); };