diff options
Diffstat (limited to 'src/gui/opengl')
61 files changed, 1303 insertions, 151 deletions
diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp index 7e663d48bb..3a476978e7 100644 --- a/src/gui/opengl/qopengl.cpp +++ b/src/gui/opengl/qopengl.cpp @@ -143,7 +143,7 @@ typedef QJsonArray::ConstIterator JsonArrayConstIt; static inline bool contains(const QJsonArray &haystack, unsigned needle) { for (JsonArrayConstIt it = haystack.constBegin(), cend = haystack.constEnd(); it != cend; ++it) { - if (needle == it->toString().toUInt(Q_NULLPTR, /* base */ 0)) + if (needle == it->toString().toUInt(nullptr, /* base */ 0)) return true; } return false; @@ -331,7 +331,7 @@ static bool matches(const QJsonObject &object, const QJsonValue vendorV = object.value(QLatin1String("vendor_id")); if (vendorV.isString()) { - if (gpu.vendorId != vendorV.toString().toUInt(Q_NULLPTR, /* base */ 0)) + if (gpu.vendorId != vendorV.toString().toUInt(nullptr, /* base */ 0)) return false; } else { if (object.contains(QLatin1String("gl_vendor"))) { diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index b5df68a3aa..b4657fa118 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -101,7 +101,9 @@ typedef void* GLeglImageOES; # define QGL_TEMP_GLEXT_PROTO # endif -# if defined(QT_OPENGL_ES_3_1) +# if defined(QT_OPENGL_ES_3_2) +# include <GLES3/gl32.h> +# elif defined(QT_OPENGL_ES_3_1) # include <GLES3/gl31.h> # elif defined(QT_OPENGL_ES_3) # include <GLES3/gl3.h> @@ -233,10 +235,6 @@ typedef long long int int64_t; typedef unsigned long long int uint64_t; #endif /* __arch64__ */ #endif /* __STDC__ */ -#elif defined( __VMS ) || defined(__sgi) -#include <inttypes.h> -#elif defined(__SCO__) || defined(__USLC__) -#include <stdint.h> #elif defined(__UNIXOS2__) || defined(__SOL64__) typedef long int int32_t; typedef long long int int64_t; diff --git a/src/gui/opengl/qopenglbuffer.h b/src/gui/opengl/qopenglbuffer.h index f2dfec3bb4..a810783731 100644 --- a/src/gui/opengl/qopenglbuffer.h +++ b/src/gui/opengl/qopenglbuffer.h @@ -124,7 +124,7 @@ public: void write(int offset, const void *data, int count); void allocate(const void *data, int count); - inline void allocate(int count) { allocate(Q_NULLPTR, count); } + inline void allocate(int count) { allocate(nullptr, count); } void *map(QOpenGLBuffer::Access access); void *mapRange(int offset, int count, QOpenGLBuffer::RangeAccessFlags access); diff --git a/src/gui/opengl/qopengldebug.h b/src/gui/opengl/qopengldebug.h index 6b10c36291..556ec175e1 100644 --- a/src/gui/opengl/qopengldebug.h +++ b/src/gui/opengl/qopengldebug.h @@ -167,7 +167,7 @@ public: }; Q_ENUM(LoggingMode) - explicit QOpenGLDebugLogger(QObject *parent = Q_NULLPTR); + explicit QOpenGLDebugLogger(QObject *parent = nullptr); ~QOpenGLDebugLogger(); bool initialize(); diff --git a/src/gui/opengl/qopenglengineshadermanager.cpp b/src/gui/opengl/qopenglengineshadermanager.cpp index 3a94fa8805..2f7afa4a66 100644 --- a/src/gui/opengl/qopenglengineshadermanager.cpp +++ b/src/gui/opengl/qopenglengineshadermanager.cpp @@ -69,13 +69,13 @@ public: delete m_shaders; } - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { delete m_shaders; m_shaders = 0; } - void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *) override { } diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h index b8b0c31f31..856adb679e 100644 --- a/src/gui/opengl/qopenglext.h +++ b/src/gui/opengl/qopenglext.h @@ -1405,10 +1405,6 @@ typedef long long int int64_t; typedef unsigned long long int uint64_t; #endif /* __arch64__ */ #endif /* __STDC__ */ -#elif defined( __VMS ) || defined(__sgi) -#include <inttypes.h> -#elif defined(__SCO__) || defined(__USLC__) -#include <stdint.h> #elif defined(__UNIXOS2__) || defined(__SOL64__) typedef long int int32_t; typedef long long int int64_t; diff --git a/src/gui/opengl/qopenglextrafunctions.h b/src/gui/opengl/qopenglextrafunctions.h index 1b36068588..a68e269065 100644 --- a/src/gui/opengl/qopenglextrafunctions.h +++ b/src/gui/opengl/qopenglextrafunctions.h @@ -52,6 +52,11 @@ #undef MemoryBarrier #endif +// GLES build without having included gl32.h -> GLDEBUGPROC is still need for the protos, define it here +#if defined(QT_OPENGL_ES_2) && !defined(QT_OPENGL_ES_3_2) +typedef void (QOPENGLF_APIENTRYP *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); +#endif + QT_BEGIN_NAMESPACE class QOpenGLExtraFunctionsPrivate; @@ -230,6 +235,50 @@ class QOpenGLExtraFunctionsPrivate; #undef glVertexAttribBinding #undef glVertexBindingDivisor +#undef glBlendBarrier +#undef glCopyImageSubData +#undef glDebugMessageControl +#undef glDebugMessageInsert +#undef glDebugMessageCallback +#undef glGetDebugMessageLog +#undef glPushDebugGroup +#undef glPopDebugGroup +#undef glObjectLabel +#undef glGetObjectLabel +#undef glGetObjectPtrLabel +#undef glGetPointerv +#undef glEnablei +#undef glDisablei +#undef glBlendEquationi +#undef glBlendEquationSeparatei +#undef glBlendFunci +#undef glBlendFuncSeparatei +#undef glColorMaski +#undef glIsEnabledi +#undef glDrawElementsBaseVertex +#undef glDrawRangeElementsBaseVertex +#undef glDrawElementsInstancedBaseVertex +#undef glFrameBufferTexture +#undef glPrimitiveBoundingBox +#undef glGetGraphicsResetStatus +#undef glReadnPixels +#undef glGetnUniformfv +#undef glGetnUniformiv +#undef glGetnUniformuiv +#undef glMinSampleShading +#undef glPatchParameteri +#undef glTexParameterIiv +#undef glTexParameterIuiv +#undef glGetTexParameterIiv +#undef glGetTexParameterIuiv +#undef glSamplerParameterIiv +#undef glSamplerParameterIuiv +#undef glGetSamplerParameterIiv +#undef glGetSamplerParameterIuiv +#undef glTexBuffer +#undef glTexBufferRange +#undef glTexStorage3DMultisample + class Q_GUI_EXPORT QOpenGLExtraFunctions : public QOpenGLFunctions { Q_DECLARE_PRIVATE(QOpenGLExtraFunctions) @@ -415,8 +464,54 @@ public: void glVertexAttribBinding(GLuint attribindex, GLuint bindingindex); void glVertexBindingDivisor(GLuint bindingindex, GLuint divisor); + // GLES 3.2 + void glBlendBarrier(void); + void glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); + void glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); + void glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); + void glDebugMessageCallback(GLDEBUGPROC callback, const void *userParam); + GLuint glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); + void glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message); + void glPopDebugGroup(void); + void glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar *label); + void glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); + void glObjectPtrLabel(const void *ptr, GLsizei length, const GLchar *label); + void glGetObjectPtrLabel(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); + void glGetPointerv(GLenum pname, void **params); + void glEnablei(GLenum target, GLuint index); + void glDisablei(GLenum target, GLuint index); + void glBlendEquationi(GLuint buf, GLenum mode); + void glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha); + void glBlendFunci(GLuint buf, GLenum src, GLenum dst); + void glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); + void glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); + GLboolean glIsEnabledi(GLenum target, GLuint index); + void glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex); + void glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex); + void glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex); + void glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level); + void glPrimitiveBoundingBox(GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); + GLenum glGetGraphicsResetStatus(void); + void glReadnPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); + void glGetnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat *params); + void glGetnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint *params); + void glGetnUniformuiv(GLuint program, GLint location, GLsizei bufSize, GLuint *params); + void glMinSampleShading(GLfloat value); + void glPatchParameteri(GLenum pname, GLint value); + void glTexParameterIiv(GLenum target, GLenum pname, const GLint *params); + void glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params); + void glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params); + void glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params); + void glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param); + void glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param); + void glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params); + void glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params); + void glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer); + void glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); + void glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); + private: - static bool isInitialized(const QOpenGLExtraFunctionsPrivate *d) { return d != Q_NULLPTR; } + static bool isInitialized(const QOpenGLExtraFunctionsPrivate *d) { return d != nullptr; } }; @@ -615,6 +710,50 @@ public: F(void, VertexAttribIFormat, (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)) \ F(void, VertexAttribBinding, (GLuint attribindex, GLuint bindingindex)) \ F(void, VertexBindingDivisor, (GLuint bindingindex, GLuint divisor)) \ + F(void, BlendBarrier, (void)) \ + F(void, BlendEquationSeparatei, (GLuint buf, GLenum modeRGB, GLenum modeAlpha)) \ + F(void, BlendEquationi, (GLuint buf, GLenum mode)) \ + F(void, BlendFuncSeparatei, (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)) \ + F(void, BlendFunci, (GLuint buf, GLenum src, GLenum dst)) \ + F(void, ColorMaski, (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)) \ + F(void, CopyImageSubData, (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)) \ + F(void, DebugMessageCallback, (GLDEBUGPROC callback, const void * userParam)) \ + F(void, DebugMessageControl, (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled)) \ + F(void, DebugMessageInsert, (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf)) \ + F(void, Disablei, (GLenum target, GLuint index)) \ + F(void, DrawElementsBaseVertex, (GLenum mode, GLsizei count, GLenum type, const void * indices, GLint basevertex)) \ + F(void, DrawElementsInstancedBaseVertex, (GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLint basevertex)) \ + F(void, DrawRangeElementsBaseVertex, (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void * indices, GLint basevertex)) \ + F(void, Enablei, (GLenum target, GLuint index)) \ + F(void, FramebufferTexture, (GLenum target, GLenum attachment, GLuint texture, GLint level)) \ + F(GLuint, GetDebugMessageLog, (GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog)) \ + F(GLenum, GetGraphicsResetStatus, (void)) \ + F(void, GetObjectLabel, (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar* label)) \ + F(void, GetObjectPtrLabel, (const void * ptr, GLsizei bufSize, GLsizei* length, GLchar* label)) \ + F(void, GetPointerv, (GLenum pname, void ** params)) \ + F(void, GetSamplerParameterIiv, (GLuint sampler, GLenum pname, GLint* params)) \ + F(void, GetSamplerParameterIuiv, (GLuint sampler, GLenum pname, GLuint* params)) \ + F(void, GetTexParameterIiv, (GLenum target, GLenum pname, GLint* params)) \ + F(void, GetTexParameterIuiv, (GLenum target, GLenum pname, GLuint* params)) \ + F(void, GetnUniformfv, (GLuint program, GLint location, GLsizei bufSize, GLfloat* params)) \ + F(void, GetnUniformiv, (GLuint program, GLint location, GLsizei bufSize, GLint* params)) \ + F(void, GetnUniformuiv, (GLuint program, GLint location, GLsizei bufSize, GLuint* params)) \ + F(GLboolean, IsEnabledi, (GLenum target, GLuint index)) \ + F(void, MinSampleShading, (GLfloat value)) \ + F(void, ObjectLabel, (GLenum identifier, GLuint name, GLsizei length, const GLchar * label)) \ + F(void, ObjectPtrLabel, (const void * ptr, GLsizei length, const GLchar * label)) \ + F(void, PatchParameteri, (GLenum pname, GLint value)) \ + F(void, PopDebugGroup, (void)) \ + F(void, PrimitiveBoundingBox, (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW)) \ + F(void, PushDebugGroup, (GLenum source, GLuint id, GLsizei length, const GLchar * message)) \ + F(void, ReadnPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void * data)) \ + F(void, SamplerParameterIiv, (GLuint sampler, GLenum pname, const GLint * param)) \ + F(void, SamplerParameterIuiv, (GLuint sampler, GLenum pname, const GLuint * param)) \ + F(void, TexBuffer, (GLenum target, GLenum internalformat, GLuint buffer)) \ + F(void, TexBufferRange, (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)) \ + F(void, TexParameterIiv, (GLenum target, GLenum pname, const GLint * params)) \ + F(void, TexParameterIuiv, (GLenum target, GLenum pname, const GLuint * params)) \ + F(void, TexStorage3DMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)) \ QT_OPENGL_DECLARE(QT_OPENGL_EXTRA_FUNCTIONS) }; @@ -2013,6 +2152,363 @@ inline void QOpenGLExtraFunctions::glVertexBindingDivisor(GLuint bindingindex, G Q_OPENGL_FUNCTIONS_DEBUG } +// GLES 3.2 + +inline void QOpenGLExtraFunctions::glBlendBarrier() +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.BlendBarrier(); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glBlendEquationi(GLuint buf, GLenum mode) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.BlendEquationi(buf, mode); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glBlendFunci(GLuint buf, GLenum src, GLenum dst) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.BlendFunci(buf, src, dst); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.ColorMaski(index, r, g, b, a); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glDebugMessageCallback(GLDEBUGPROC callback, const void * userParam) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.DebugMessageCallback(callback, userParam); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.DebugMessageControl(source, type, severity, count, ids, enabled); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.DebugMessageInsert(source, type, id, severity, length, buf); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glDisablei(GLenum target, GLuint index) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.Disablei(target, index); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void * indices, GLint basevertex) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLint basevertex) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void * indices, GLint basevertex) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glEnablei(GLenum target, GLuint index) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.Enablei(target, index); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.FramebufferTexture(target, attachment, texture, level); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline GLuint QOpenGLExtraFunctions::glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + GLuint result = d->f.GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog); + Q_OPENGL_FUNCTIONS_DEBUG + return result; +} + +inline GLenum QOpenGLExtraFunctions::glGetGraphicsResetStatus() +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + GLenum result = d->f.GetGraphicsResetStatus(); + Q_OPENGL_FUNCTIONS_DEBUG + return result; +} + +inline void QOpenGLExtraFunctions::glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar* label) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetObjectLabel(identifier, name, bufSize, length, label); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glGetObjectPtrLabel(const void * ptr, GLsizei bufSize, GLsizei* length, GLchar* label) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetObjectPtrLabel(ptr, bufSize, length, label); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glGetPointerv(GLenum pname, void ** params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetPointerv(pname, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint* params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetSamplerParameterIiv(sampler, pname, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint* params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetSamplerParameterIuiv(sampler, pname, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glGetTexParameterIiv(GLenum target, GLenum pname, GLint* params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetTexParameterIiv(target, pname, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint* params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetTexParameterIuiv(target, pname, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glGetnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat* params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetnUniformfv(program, location, bufSize, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glGetnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint* params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetnUniformiv(program, location, bufSize, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glGetnUniformuiv(GLuint program, GLint location, GLsizei bufSize, GLuint* params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.GetnUniformuiv(program, location, bufSize, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline GLboolean QOpenGLExtraFunctions::glIsEnabledi(GLenum target, GLuint index) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + GLboolean result = d->f.IsEnabledi(target, index); + Q_OPENGL_FUNCTIONS_DEBUG + return result; +} + +inline void QOpenGLExtraFunctions::glMinSampleShading(GLfloat value) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.MinSampleShading(value); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar * label) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.ObjectLabel(identifier, name, length, label); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glObjectPtrLabel(const void * ptr, GLsizei length, const GLchar * label) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.ObjectPtrLabel(ptr, length, label); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glPatchParameteri(GLenum pname, GLint value) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.PatchParameteri(pname, value); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glPopDebugGroup() +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.PopDebugGroup(); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glPrimitiveBoundingBox(GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.PrimitiveBoundingBox(minX, minY, minZ, minW, maxX, maxY, maxZ, maxW); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar * message) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.PushDebugGroup(source, id, length, message); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glReadnPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void * data) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.ReadnPixels(x, y, width, height, format, type, bufSize, data); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint * param) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.SamplerParameterIiv(sampler, pname, param); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint * param) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.SamplerParameterIuiv(sampler, pname, param); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.TexBuffer(target, internalformat, buffer); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.TexBufferRange(target, internalformat, buffer, offset, size); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glTexParameterIiv(GLenum target, GLenum pname, const GLint * params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.TexParameterIiv(target, pname, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint * params) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.TexParameterIuiv(target, pname, params); + Q_OPENGL_FUNCTIONS_DEBUG +} + +inline void QOpenGLExtraFunctions::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations) +{ + Q_D(QOpenGLExtraFunctions); + Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d)); + d->f.TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations); + Q_OPENGL_FUNCTIONS_DEBUG +} + QT_END_NAMESPACE #undef QT_OPENGL_DECLARE_FUNCTIONS diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index b56bcd0866..469f019a1c 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -816,7 +816,7 @@ static inline GLenum effectiveInternalFormat(GLenum internalFormat) return internalFormat; } -/*! \fn QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, GLenum target) +/*! Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture to the buffer of the size \a size. The texture is bound to the @@ -847,7 +847,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, GLenum tar d->init(this, size, NoAttachment, target, effectiveInternalFormat(0)); } -/*! \overload +/*! Constructs an OpenGL framebuffer object and binds a 2D OpenGL texture to the buffer of the given \a width and \a height. @@ -859,7 +859,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, GLenum { } -/*! \overload +/*! Constructs an OpenGL framebuffer object of the given \a size based on the supplied \a format. @@ -873,7 +873,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, const QOpe format.samples(), format.mipmap()); } -/*! \overload +/*! Constructs an OpenGL framebuffer object of the given \a width and \a height based on the supplied \a format. @@ -884,7 +884,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, const { } -/*! \overload +/*! Constructs an OpenGL framebuffer object and binds a texture to the buffer of the given \a width and \a height. @@ -905,7 +905,7 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(int width, int height, Attach d->init(this, QSize(width, height), attachment, target, effectiveInternalFormat(internalFormat)); } -/*! \overload +/*! Constructs an OpenGL framebuffer object and binds a texture to the buffer of the given \a size. @@ -927,7 +927,6 @@ QOpenGLFramebufferObject::QOpenGLFramebufferObject(const QSize &size, Attachment } /*! - \fn QOpenGLFramebufferObject::~QOpenGLFramebufferObject() Destroys the framebuffer object and frees any allocated resources. */ @@ -953,7 +952,7 @@ QOpenGLFramebufferObject::~QOpenGLFramebufferObject() QOpenGLContextPrivate *contextPrv = QOpenGLContextPrivate::get(QOpenGLContext::currentContext()); if (contextPrv && contextPrv->qgl_current_fbo == this) { contextPrv->qgl_current_fbo_invalid = true; - contextPrv->qgl_current_fbo = Q_NULLPTR; + contextPrv->qgl_current_fbo = nullptr; } } @@ -1116,7 +1115,7 @@ bool QOpenGLFramebufferObject::release() QOpenGLContextPrivate *contextPrv = QOpenGLContextPrivate::get(current); contextPrv->qgl_current_fbo_invalid = true; - contextPrv->qgl_current_fbo = Q_NULLPTR; + contextPrv->qgl_current_fbo = nullptr; } return true; @@ -1472,7 +1471,7 @@ bool QOpenGLFramebufferObject::bindDefault() if (ctx) { ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject()); QOpenGLContextPrivate::get(ctx)->qgl_current_fbo_invalid = true; - QOpenGLContextPrivate::get(ctx)->qgl_current_fbo = Q_NULLPTR; + QOpenGLContextPrivate::get(ctx)->qgl_current_fbo = nullptr; } #ifdef QT_DEBUG else diff --git a/src/gui/opengl/qopenglframebufferobject.h b/src/gui/opengl/qopenglframebufferobject.h index b9e61e9ee4..161054d1bf 100644 --- a/src/gui/opengl/qopenglframebufferobject.h +++ b/src/gui/opengl/qopenglframebufferobject.h @@ -49,8 +49,18 @@ #include <QtCore/qscopedpointer.h> -QT_BEGIN_NAMESPACE +#if defined(Q_CLANG_QDOC) +#undef GLuint +typedef unsigned int GLuint; +#undef GLenum +typedef unsigned int GLenum; +#undef GL_TEXTURE_2D +#define GL_TEXTURE_2D 0x0DE1 +#undef GLbitfield +typedef unsigned int GLbitfield; +#endif +QT_BEGIN_NAMESPACE class QOpenGLFramebufferObjectPrivate; class QOpenGLFramebufferObjectFormat; diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index e724efab37..ff044a91da 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -216,13 +216,13 @@ struct QOpenGLFunctionsPrivateEx : public QOpenGLExtensionsPrivate, public QOpen , m_extensions(-1) {} - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_features = -1; m_extensions = -1; } - void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *) override { // no gl resources to free } @@ -2213,17 +2213,17 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS) /*! \class QOpenGLExtraFunctions - \brief The QOpenGLExtraFunctions class provides cross-platform access to the OpenGL ES 3.0 and 3.1 API. + \brief The QOpenGLExtraFunctions class provides cross-platform access to the OpenGL ES 3.0, 3.1 and 3.2 API. \since 5.6 \ingroup painting-3D \inmodule QtGui - This subclass of QOpenGLFunctions includes the OpenGL ES 3.0 and 3.1 - functions. These will only work when an OpenGL ES 3.0 or 3.1 context, or an + This subclass of QOpenGLFunctions includes the OpenGL ES 3.0, 3.1 and 3.2 + functions. These will only work when an OpenGL ES 3.x context, or an OpenGL context of a version containing the functions in question either in - core or as extension, is in use. This allows developing GLES 3.0 and 3.1 + core or as extension, is in use. This allows developing GLES 3.x applications in a cross-platform manner: development can happen on a desktop - platform with OpenGL 3.x or 4.x, deploying to a real GLES 3.1 device later + platform with OpenGL 3.x or 4.x, deploying to a true GLES 3.x device later on will require no or minimal changes to the application. \note This class is different from the versioned OpenGL wrappers, for @@ -2584,7 +2584,7 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS) */ /*! - \fn void QOpenGLExtraFunctions::glEndTransformFeedback(void) + \fn void QOpenGLExtraFunctions::glEndTransformFeedback() Convenience function that calls glEndTransformFeedback(). @@ -3091,7 +3091,7 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS) */ /*! - \fn void QOpenGLExtraFunctions::glPauseTransformFeedback(void) + \fn void QOpenGLExtraFunctions::glPauseTransformFeedback() Convenience function that calls glPauseTransformFeedback(). @@ -3156,7 +3156,7 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS) */ /*! - \fn void QOpenGLExtraFunctions::glResumeTransformFeedback(void) + \fn void QOpenGLExtraFunctions::glResumeTransformFeedback() Convenience function that calls glResumeTransformFeedback(). @@ -4469,6 +4469,578 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS) */ /*! + \fn void QOpenGLExtraFunctions::glBlendBarrier(void) + + Convenience function that calls glBlendBarrier(). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendBarrier.xml}{glBlendBarrier()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha) + + Convenience function that calls glBlendEquationSeparatei(\a buf, \a modeRGB, \a modeAlpha). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendEquationSeparatei.xml}{glBlendEquationSeparatei()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glBlendEquationi(GLuint buf, GLenum mode) + + Convenience function that calls glBlendEquationi(\a buf, \a mode). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendEquationi.xml}{glBlendEquationi()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) + + Convenience function that calls glBlendFuncSeparatei(\a buf, \a srcRGB, \a dstRGB, \a srcAlpha, \a dstAlpha). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendFuncSeparatei.xml}{glBlendFuncSeparatei()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glBlendFunci(GLuint buf, GLenum src, GLenum dst) + + Convenience function that calls glBlendFunci(\a buf, \a src, \a dst). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glBlendFunci.xml}{glBlendFunci()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a) + + Convenience function that calls glColorMaski(\a index, \a r, \a g, \a b, \a a). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glColorMaski.xml}{glColorMaski()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth) + + Convenience function that calls glCopyImageSubData(\a srcName, \a srcTarget, \a srcLevel, \a srcX, \a srcY, \a srcZ, \a dstName, \a dstTarget, \a dstLevel, \a dstX, \a dstY, \a dstZ, \a srcWidth, \a srcHeight, \a srcDepth). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glCopyImageSubData.xml}{glCopyImageSubData()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glDebugMessageCallback(GLDEBUGPROC callback, const void * userParam) + + Convenience function that calls glDebugMessageCallback(\a callback, \a userParam). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glDebugMessageCallback.xml}{glDebugMessageCallback()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled) + + Convenience function that calls glDebugMessageControl(\a source, \a type, \a severity, \a count, \a ids, \a enabled). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glDebugMessageControl.xml}{glDebugMessageContro()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf) + + Convenience function that calls glDebugMessageInsert(\a source, \a type, \a id, \a severity, \a length, \a buf). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glDebugMessageInsert.xml}{glDebugMessageInsert()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glDisablei(GLenum target, GLuint index) + + Convenience function that calls glDisablei(\a target, \a index). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glDisablei.xml}{glDisablei()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void * indices, GLint basevertex) + + Convenience function that calls glDrawElementsBaseVertex(\a mode, \a count, \a type, \a indices, \a basevertex). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glDrawElementsBaseVertex.xml}{glDrawElementsBaseVerte()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLint basevertex) + + Convenience function that calls glDrawElementsInstancedBaseVertex(\a mode, \a count, \a type, \a indices, \a instancecount, \a basevertex). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glDrawElementsInstancedBaseVertex.xml}{glDrawElementsInstancedBaseVerte()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void * indices, GLint basevertex) + + Convenience function that calls glDrawRangeElementsBaseVertex(\a mode, \a start, \a end, \a count, \a type, \a indices, \a basevertex). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glDrawRangeElementsBaseVertex.xml}{glDrawRangeElementsBaseVerte()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glEnablei(GLenum target, GLuint index) + + Convenience function that calls glEnablei(\a target, \a index). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glEnablei.xml}{glEnablei()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level) + + Convenience function that calls glFramebufferTexture(\a target, \a attachment, \a texture, \a level). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glFramebufferTexture.xml}{glFramebufferTexture()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog) + + Convenience function that calls glGetDebugMessageLog(\a count, \a bufSize, \a sources, \a types, \a ids, \a severities, \a lengths, \a messageLog). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetDebugMessageLog.xml}{glGetDebugMessageLog()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetGraphicsResetStatus(void) + + Convenience function that calls glGetGraphicsResetStatus(). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetGraphicsResetStatus.xml}{glGetGraphicsResetStatus()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar* label) + + Convenience function that calls glGetObjectLabel(\a identifier, \a name, \a bufSize, \a length, \a label). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetObjectLabel.xml}{glGetObjectLabe()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetObjectPtrLabel(const void * ptr, GLsizei bufSize, GLsizei* length, GLchar* label) + + Convenience function that calls glGetObjectPtrLabel(\a ptr, \a bufSize, \a length, \a label). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetObjectPtrLabel.xml}{glGetObjectPtrLabe()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetPointerv(GLenum pname, void ** params) + + Convenience function that calls glGetPointerv(\a pname, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetPointerv.xml}{glGetPointerv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint* params) + + Convenience function that calls glGetSamplerParameterIiv(\a sampler, \a pname, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetSamplerParameterIiv.xml}{glGetSamplerParameterIiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint* params) + + Convenience function that calls glGetSamplerParameterIuiv(\a sampler, \a pname, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetSamplerParameterIuiv.xml}{glGetSamplerParameterIuiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetTexParameterIiv(GLenum target, GLenum pname, GLint* params) + + Convenience function that calls glGetTexParameterIiv(\a target, \a pname, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetTexParameterIiv.xml}{glGetTexParameterIiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint* params) + + Convenience function that calls glGetTexParameterIuiv(\a target, \a pname, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetTexParameterIuiv.xml}{glGetTexParameterIuiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat* params) + + Convenience function that calls glGetnUniformfv(\a program, \a location, \a bufSize, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetnUniformfv.xml}{glGetnUniformfv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint* params) + + Convenience function that calls glGetnUniformiv(\a program, \a location, \a bufSize, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetnUniformiv.xml}{glGetnUniformiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glGetnUniformuiv(GLuint program, GLint location, GLsizei bufSize, GLuint* params) + + Convenience function that calls glGetnUniformuiv(\a program, \a location, \a bufSize, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glGetnUniformuiv.xml}{glGetnUniformuiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glIsEnabledi(GLenum target, GLuint index) + + Convenience function that calls glIsEnabledi(\a target, \a index). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glIsEnabledi.xml}{glIsEnabledi()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glMinSampleShading(GLfloat value) + + Convenience function that calls glMinSampleShading(\a value). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glMinSampleShading.xml}{glMinSampleShading()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar * label) + + Convenience function that calls glObjectLabel(\a identifier, \a name, \a length, \a label). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glObjectLabel.xml}{glObjectLabe()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glObjectPtrLabel(const void * ptr, GLsizei length, const GLchar * label) + + Convenience function that calls glObjectPtrLabel(\a ptr, \a length, \a label). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glObjectPtrLabel.xml}{glObjectPtrLabe()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glPatchParameteri(GLenum pname, GLint value) + + Convenience function that calls glPatchParameteri(\a pname, \a value). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glPatchParameteri.xml}{glPatchParameteri()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glPopDebugGroup(void) + + Convenience function that calls glPopDebugGroup(). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glPopDebugGroup.xml}{glPopDebugGroup()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glPrimitiveBoundingBox(GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW) + + Convenience function that calls glPrimitiveBoundingBox(\a minX, \a minY, \a minZ, \a minW, \a maxX, \a maxY, \a maxZ, \a maxW). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glPrimitiveBoundingBox.xml}{glPrimitiveBoundingBo()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar * message) + + Convenience function that calls glPushDebugGroup(\a source, \a id, \a length, \a message). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glPushDebugGroup.xml}{glPushDebugGroup()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glReadnPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void * data) + + Convenience function that calls glReadnPixels(\a x, \a y, \a width, \a height, \a format, \a type, \a bufSize, \a data). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glReadnPixels.xml}{glReadnPixels()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint * param) + + Convenience function that calls glSamplerParameterIiv(\a sampler, \a pname, \a param). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glSamplerParameterIiv.xml}{glSamplerParameterIiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint * param) + + Convenience function that calls glSamplerParameterIuiv(\a sampler, \a pname, \a param). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glSamplerParameterIuiv.xml}{glSamplerParameterIuiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer) + + Convenience function that calls glTexBuffer(\a target, \a internalformat, \a buffer). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexBuffer.xml}{glTexBuffer()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size) + + Convenience function that calls glTexBufferRange(\a target, \a internalformat, \a buffer, \a offset, \a size). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexBufferRange.xml}{glTexBufferRange()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glTexParameterIiv(GLenum target, GLenum pname, const GLint * params) + + Convenience function that calls glTexParameterIiv(\a target, \a pname, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexParameterIiv.xml}{glTexParameterIiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint * params) + + Convenience function that calls glTexParameterIuiv(\a target, \a pname, \a params). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexParameterIuiv.xml}{glTexParameterIuiv()}. +*/ + +/*! + \fn void QOpenGLExtraFunctions::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations) + + Convenience function that calls glTexStorage3DMultisample(\a target, \a samples, \a internalformat, \a width, \a height, \a depth, \a fixedsamplelocations). + + This function is only available in OpenGL ES 3.x, or OpenGL 3.x or 4.x contexts. When running + with plain OpenGL, the function is only usable when the given profile and version contains the + function either in core or as an extension. + + For more information, see the OpenGL ES 3.2 documentation for + \l{http://www.khronos.org/opengles/sdk/docs/man32/glTexStorage3DMultisample.xml}{glTexStorage3DMultisample()}. +*/ + +/*! \fn bool QOpenGLExtraFunctions::isInitialized(const QOpenGLExtraFunctionsPrivate *d) \internal */ diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 0a5de2c9af..1a43f13d9b 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -227,6 +227,31 @@ struct QOpenGLFunctionsPrivate; #undef glTexLevelParameteriv +#if defined(Q_CLANG_QDOC) +#undef GLint +typedef int GLint; +#undef GLsizei +typedef int GLsizei; +#undef GLuint +typedef unsigned int GLuint; +#undef GLubyte +typedef unsigned int GLubyte; +#undef GLenum +typedef unsigned int GLenum; +#undef GLbitfield +typedef unsigned int GLbitfield; +#undef GLfloat +typedef float GLfloat; +#undef GLclampf +typedef float GLclampf; +#undef GLboolean +typedef bool GLboolean; +#undef GLvoid +typedef void GLvoid; +#undef GLchar +typedef char GLchar; +#endif + class Q_GUI_EXPORT QOpenGLFunctions { public: @@ -413,7 +438,7 @@ public: protected: QOpenGLFunctionsPrivate *d_ptr; - static bool isInitialized(const QOpenGLFunctionsPrivate *d) { return d != Q_NULLPTR; } + static bool isInitialized(const QOpenGLFunctionsPrivate *d) { return d != nullptr; } }; Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLFunctions::OpenGLFeatures) diff --git a/src/gui/opengl/qopenglfunctions_1_0.h b/src/gui/opengl/qopenglfunctions_1_0.h index 8284604086..cddb7251ed 100644 --- a/src/gui/opengl/qopenglfunctions_1_0.h +++ b/src/gui/opengl/qopenglfunctions_1_0.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_0(); ~QOpenGLFunctions_1_0(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_1.h b/src/gui/opengl/qopenglfunctions_1_1.h index 052d3e93bd..8a9f16ec4c 100644 --- a/src/gui/opengl/qopenglfunctions_1_1.h +++ b/src/gui/opengl/qopenglfunctions_1_1.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_1(); ~QOpenGLFunctions_1_1(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_2.h b/src/gui/opengl/qopenglfunctions_1_2.h index 6b36500a79..7daca0923d 100644 --- a/src/gui/opengl/qopenglfunctions_1_2.h +++ b/src/gui/opengl/qopenglfunctions_1_2.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_2(); ~QOpenGLFunctions_1_2(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_3.h b/src/gui/opengl/qopenglfunctions_1_3.h index 3ed5851d5d..b527b57946 100644 --- a/src/gui/opengl/qopenglfunctions_1_3.h +++ b/src/gui/opengl/qopenglfunctions_1_3.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_3(); ~QOpenGLFunctions_1_3(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_4.h b/src/gui/opengl/qopenglfunctions_1_4.h index 849fad6744..1f3f5a9c0a 100644 --- a/src/gui/opengl/qopenglfunctions_1_4.h +++ b/src/gui/opengl/qopenglfunctions_1_4.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_4(); ~QOpenGLFunctions_1_4(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_5.h b/src/gui/opengl/qopenglfunctions_1_5.h index 18914a8957..d2f5311211 100644 --- a/src/gui/opengl/qopenglfunctions_1_5.h +++ b/src/gui/opengl/qopenglfunctions_1_5.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_5(); ~QOpenGLFunctions_1_5(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_2_0.cpp b/src/gui/opengl/qopenglfunctions_2_0.cpp index c175b13c5b..212723aa00 100644 --- a/src/gui/opengl/qopenglfunctions_2_0.cpp +++ b/src/gui/opengl/qopenglfunctions_2_0.cpp @@ -79,7 +79,7 @@ QOpenGLFunctions_2_0::QOpenGLFunctions_2_0() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , m_reserved_2_0_Deprecated(Q_NULLPTR) + , m_reserved_2_0_Deprecated(nullptr) { } diff --git a/src/gui/opengl/qopenglfunctions_2_0.h b/src/gui/opengl/qopenglfunctions_2_0.h index 74a91e0ff0..556597a9b3 100644 --- a/src/gui/opengl/qopenglfunctions_2_0.h +++ b/src/gui/opengl/qopenglfunctions_2_0.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_2_0(); ~QOpenGLFunctions_2_0(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_2_1.cpp b/src/gui/opengl/qopenglfunctions_2_1.cpp index 4e77efd121..b8b255014c 100644 --- a/src/gui/opengl/qopenglfunctions_2_1.cpp +++ b/src/gui/opengl/qopenglfunctions_2_1.cpp @@ -80,7 +80,7 @@ QOpenGLFunctions_2_1::QOpenGLFunctions_2_1() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , m_reserved_2_0_Deprecated(Q_NULLPTR) + , m_reserved_2_0_Deprecated(nullptr) { } diff --git a/src/gui/opengl/qopenglfunctions_2_1.h b/src/gui/opengl/qopenglfunctions_2_1.h index e9212640f7..f053222c71 100644 --- a/src/gui/opengl/qopenglfunctions_2_1.h +++ b/src/gui/opengl/qopenglfunctions_2_1.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_2_1(); ~QOpenGLFunctions_2_1(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_0.cpp b/src/gui/opengl/qopenglfunctions_3_0.cpp index 09e3ad09ef..4972c03b1e 100644 --- a/src/gui/opengl/qopenglfunctions_3_0.cpp +++ b/src/gui/opengl/qopenglfunctions_3_0.cpp @@ -81,8 +81,8 @@ QOpenGLFunctions_3_0::QOpenGLFunctions_3_0() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , m_reserved_2_0_Deprecated(Q_NULLPTR) - , m_reserved_3_0_Deprecated(Q_NULLPTR) + , m_reserved_2_0_Deprecated(nullptr) + , m_reserved_3_0_Deprecated(nullptr) { } diff --git a/src/gui/opengl/qopenglfunctions_3_0.h b/src/gui/opengl/qopenglfunctions_3_0.h index 1082d869d1..c592050c24 100644 --- a/src/gui/opengl/qopenglfunctions_3_0.h +++ b/src/gui/opengl/qopenglfunctions_3_0.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_0(); ~QOpenGLFunctions_3_0(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_1.h b/src/gui/opengl/qopenglfunctions_3_1.h index 2691dd29e7..3a8d3891f3 100644 --- a/src/gui/opengl/qopenglfunctions_3_1.h +++ b/src/gui/opengl/qopenglfunctions_3_1.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_1(); ~QOpenGLFunctions_3_1(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp index b90a123bfe..709f65edf8 100644 --- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp @@ -83,8 +83,8 @@ QOpenGLFunctions_3_2_Compatibility::QOpenGLFunctions_3_2_Compatibility() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , m_reserved_2_0_Deprecated(Q_NULLPTR) - , m_reserved_3_0_Deprecated(Q_NULLPTR) + , m_reserved_2_0_Deprecated(nullptr) + , m_reserved_3_0_Deprecated(nullptr) { } diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h index 9f34190721..391e725953 100644 --- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_2_Compatibility(); ~QOpenGLFunctions_3_2_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_2_core.h b/src/gui/opengl/qopenglfunctions_3_2_core.h index 2d5ee14bee..1eafb6f441 100644 --- a/src/gui/opengl/qopenglfunctions_3_2_core.h +++ b/src/gui/opengl/qopenglfunctions_3_2_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_2_Core(); ~QOpenGLFunctions_3_2_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp index c585f0fc7c..b034391c86 100644 --- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp @@ -84,7 +84,7 @@ QOpenGLFunctions_3_3_Compatibility::QOpenGLFunctions_3_3_Compatibility() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , m_reserved_2_0_Deprecated(Q_NULLPTR) + , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(0) { } diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h index a5c0cab63c..185dd5aab4 100644 --- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_3_Compatibility(); ~QOpenGLFunctions_3_3_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_3_core.h b/src/gui/opengl/qopenglfunctions_3_3_core.h index 4f0132d959..47d54d717e 100644 --- a/src/gui/opengl/qopenglfunctions_3_3_core.h +++ b/src/gui/opengl/qopenglfunctions_3_3_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_3_Core(); ~QOpenGLFunctions_3_3_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp index b5c423ef0c..4fe4526efc 100644 --- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp @@ -85,7 +85,7 @@ QOpenGLFunctions_4_0_Compatibility::QOpenGLFunctions_4_0_Compatibility() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , m_reserved_2_0_Deprecated(Q_NULLPTR) + , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(0) { } diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h index 1fa5e8a361..c0e42443d3 100644 --- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_0_Compatibility(); ~QOpenGLFunctions_4_0_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_0_core.h b/src/gui/opengl/qopenglfunctions_4_0_core.h index 8fd2af2d04..6cb55e86f7 100644 --- a/src/gui/opengl/qopenglfunctions_4_0_core.h +++ b/src/gui/opengl/qopenglfunctions_4_0_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_0_Core(); ~QOpenGLFunctions_4_0_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp index 72c60c74b7..41ecb4672a 100644 --- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp @@ -86,7 +86,7 @@ QOpenGLFunctions_4_1_Compatibility::QOpenGLFunctions_4_1_Compatibility() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , m_reserved_2_0_Deprecated(Q_NULLPTR) + , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(0) { } diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h index a284f8e6d3..bee169b50c 100644 --- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_1_Compatibility(); ~QOpenGLFunctions_4_1_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_1_core.h b/src/gui/opengl/qopenglfunctions_4_1_core.h index d35db3c839..3a4fd0743b 100644 --- a/src/gui/opengl/qopenglfunctions_4_1_core.h +++ b/src/gui/opengl/qopenglfunctions_4_1_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_1_Core(); ~QOpenGLFunctions_4_1_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp index 8398ef0948..fcc049c67b 100644 --- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp @@ -87,7 +87,7 @@ QOpenGLFunctions_4_2_Compatibility::QOpenGLFunctions_4_2_Compatibility() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , m_reserved_2_0_Deprecated(Q_NULLPTR) + , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(0) { } diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h index 7b45859984..6726d5fc44 100644 --- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_2_Compatibility(); ~QOpenGLFunctions_4_2_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_2_core.h b/src/gui/opengl/qopenglfunctions_4_2_core.h index 80bb33e7d8..a921329741 100644 --- a/src/gui/opengl/qopenglfunctions_4_2_core.h +++ b/src/gui/opengl/qopenglfunctions_4_2_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_2_Core(); ~QOpenGLFunctions_4_2_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp index 19e67c6331..131ebc810f 100644 --- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp +++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp @@ -88,7 +88,7 @@ QOpenGLFunctions_4_3_Compatibility::QOpenGLFunctions_4_3_Compatibility() , d_1_2_Deprecated(0) , d_1_3_Deprecated(0) , d_1_4_Deprecated(0) - , m_reserved_2_0_Deprecated(Q_NULLPTR) + , m_reserved_2_0_Deprecated(nullptr) , d_3_3_Deprecated(0) { } diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h index 515467a38d..b9d4eb1d6f 100644 --- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_3_Compatibility(); ~QOpenGLFunctions_4_3_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_3_core.h b/src/gui/opengl/qopenglfunctions_4_3_core.h index 4a700c36d7..da552d64af 100644 --- a/src/gui/opengl/qopenglfunctions_4_3_core.h +++ b/src/gui/opengl/qopenglfunctions_4_3_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_3_Core(); ~QOpenGLFunctions_4_3_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h index f2d640cdaf..7a05bd802d 100644 --- a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_4_Compatibility(); ~QOpenGLFunctions_4_4_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_4_core.h b/src/gui/opengl/qopenglfunctions_4_4_core.h index bcb7383a9e..6b29a9659b 100644 --- a/src/gui/opengl/qopenglfunctions_4_4_core.h +++ b/src/gui/opengl/qopenglfunctions_4_4_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_4_Core(); ~QOpenGLFunctions_4_4_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_5_compatibility.h b/src/gui/opengl/qopenglfunctions_4_5_compatibility.h index b164538686..7a97085a85 100644 --- a/src/gui/opengl/qopenglfunctions_4_5_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_5_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_5_Compatibility(); ~QOpenGLFunctions_4_5_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_5_core.h b/src/gui/opengl/qopenglfunctions_4_5_core.h index 0940d8cf61..bb1b17f7b1 100644 --- a/src/gui/opengl/qopenglfunctions_4_5_core.h +++ b/src/gui/opengl/qopenglfunctions_4_5_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_5_Core(); ~QOpenGLFunctions_4_5_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_es2.h b/src/gui/opengl/qopenglfunctions_es2.h index 3b7d2806ea..851eb5951b 100644 --- a/src/gui/opengl/qopenglfunctions_es2.h +++ b/src/gui/opengl/qopenglfunctions_es2.h @@ -57,7 +57,7 @@ public: QOpenGLFunctions_ES2(); ~QOpenGLFunctions_ES2(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL ES2 core functions void glActiveTexture(GLenum texture); diff --git a/src/gui/opengl/qopenglgradientcache.cpp b/src/gui/opengl/qopenglgradientcache.cpp index 58dcbed50a..3aa4c0d2e6 100644 --- a/src/gui/opengl/qopenglgradientcache.cpp +++ b/src/gui/opengl/qopenglgradientcache.cpp @@ -42,6 +42,7 @@ #include <private/qopenglcontext_p.h> #include <private/qrgba64_p.h> #include <QtCore/qmutex.h> +#include <QtCore/qrandom.h> #include "qopenglfunctions.h" #include "qopenglextensions_p.h" @@ -137,7 +138,7 @@ GLuint QOpenGL2GradientCache::addCacheElement(quint64 hash_val, const QGradient { QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions(); if (cache.size() == maxCacheSize()) { - int elem_to_remove = qrand() % maxCacheSize(); + int elem_to_remove = QRandomGenerator::global()->bounded(maxCacheSize()); quint64 key = cache.keys()[elem_to_remove]; // need to call glDeleteTextures on each removed cache entry: diff --git a/src/gui/opengl/qopenglgradientcache_p.h b/src/gui/opengl/qopenglgradientcache_p.h index a2ed85c061..cbdbbb0c54 100644 --- a/src/gui/opengl/qopenglgradientcache_p.h +++ b/src/gui/opengl/qopenglgradientcache_p.h @@ -85,8 +85,8 @@ public: GLuint getBuffer(const QGradient &gradient, qreal opacity); inline int paletteSize() const { return 1024; } - void invalidateResource() Q_DECL_OVERRIDE; - void freeResource(QOpenGLContext *ctx) Q_DECL_OVERRIDE; + void invalidateResource() override; + void freeResource(QOpenGLContext *ctx) override; private: inline int maxCacheSize() const { return 60; } diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp index e539ee0e31..3a0c02feb0 100644 --- a/src/gui/opengl/qopenglpaintdevice.cpp +++ b/src/gui/opengl/qopenglpaintdevice.cpp @@ -96,7 +96,7 @@ QT_BEGIN_NAMESPACE When intermixing QPainter and OpenGL, it is important to notify QPainter that the OpenGL state may have been cluttered so it can - restore its internal state. This is acheived by calling \l + restore its internal state. This is achieved by calling \l QPainter::beginNativePainting() before starting the OpenGL rendering and calling \l QPainter::endNativePainting() after finishing. diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h index 679b3c0557..0541ce6168 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h @@ -116,37 +116,37 @@ public: QOpenGL2PaintEngineEx(); ~QOpenGL2PaintEngineEx(); - bool begin(QPaintDevice *device) Q_DECL_OVERRIDE; + bool begin(QPaintDevice *device) override; void ensureActive(); - bool end() Q_DECL_OVERRIDE; - - virtual void clipEnabledChanged() Q_DECL_OVERRIDE; - virtual void penChanged() Q_DECL_OVERRIDE; - virtual void brushChanged() Q_DECL_OVERRIDE; - virtual void brushOriginChanged() Q_DECL_OVERRIDE; - virtual void opacityChanged() Q_DECL_OVERRIDE; - virtual void compositionModeChanged() Q_DECL_OVERRIDE; - virtual void renderHintsChanged() Q_DECL_OVERRIDE; - virtual void transformChanged() Q_DECL_OVERRIDE; - - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; + bool end() override; + + virtual void clipEnabledChanged() override; + virtual void penChanged() override; + virtual void brushChanged() override; + virtual void brushOriginChanged() override; + virtual void opacityChanged() override; + virtual void compositionModeChanged() override; + virtual void renderHintsChanged() override; + virtual void transformChanged() override; + + virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, - QPainter::PixmapFragmentHints hints) Q_DECL_OVERRIDE; + QPainter::PixmapFragmentHints hints) override; virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; - virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; - virtual void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE; - virtual void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE; - virtual void clip(const QVectorPath &path, Qt::ClipOperation op) Q_DECL_OVERRIDE; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; + virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) override; + virtual void fill(const QVectorPath &path, const QBrush &brush) override; + virtual void stroke(const QVectorPath &path, const QPen &pen) override; + virtual void clip(const QVectorPath &path, Qt::ClipOperation op) override; - virtual void drawStaticTextItem(QStaticTextItem *textItem) Q_DECL_OVERRIDE; + virtual void drawStaticTextItem(QStaticTextItem *textItem) override; bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr); - Type type() const Q_DECL_OVERRIDE { return OpenGL2; } + Type type() const override { return OpenGL2; } - virtual void setState(QPainterState *s) Q_DECL_OVERRIDE; - virtual QPainterState *createState(QPainterState *orig) const Q_DECL_OVERRIDE; + virtual void setState(QPainterState *s) override; + virtual QPainterState *createState(QPainterState *orig) const override; inline QOpenGL2PaintEngineState *state() { return static_cast<QOpenGL2PaintEngineState *>(QPaintEngineEx::state()); } @@ -154,16 +154,16 @@ public: return static_cast<const QOpenGL2PaintEngineState *>(QPaintEngineEx::state()); } - void beginNativePainting() Q_DECL_OVERRIDE; - void endNativePainting() Q_DECL_OVERRIDE; + void beginNativePainting() override; + void endNativePainting() override; void invalidateState(); void setRenderTextActive(bool); bool isNativePaintingActive() const; - bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE { return false; } - bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE; + bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const override { return false; } + bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const override; private: Q_DISABLE_COPY(QOpenGL2PaintEngineEx) @@ -265,7 +265,7 @@ public: void updateClipScissorTest(); void setScissor(const QRect &rect); void regenerateClip(); - void systemStateChanged() Q_DECL_OVERRIDE; + void systemStateChanged() override; void setVertexAttribArrayEnabled(int arrayIndex, bool enabled = true); void syncGlState(); diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index cc8af16bfe..b044397f8e 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -562,7 +562,7 @@ static QVersionDirectivePosition findVersionDirectivePosition(const char *source break; } state = Normal; - // fall through + Q_FALLTHROUGH(); case Normal: if (*c == '/') state = CommentStarting; diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h index fd4d82ecf9..84eb8d6956 100644 --- a/src/gui/opengl/qopenglshaderprogram.h +++ b/src/gui/opengl/qopenglshaderprogram.h @@ -79,7 +79,7 @@ public: }; Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit) - explicit QOpenGLShader(QOpenGLShader::ShaderType type, QObject *parent = Q_NULLPTR); + explicit QOpenGLShader(QOpenGLShader::ShaderType type, QObject *parent = nullptr); virtual ~QOpenGLShader(); QOpenGLShader::ShaderType shaderType() const; @@ -96,7 +96,7 @@ public: GLuint shaderId() const; - static bool hasOpenGLShaders(ShaderType type, QOpenGLContext *context = Q_NULLPTR); + static bool hasOpenGLShaders(ShaderType type, QOpenGLContext *context = nullptr); private: friend class QOpenGLShaderProgram; @@ -114,7 +114,7 @@ class Q_GUI_EXPORT QOpenGLShaderProgram : public QObject { Q_OBJECT public: - explicit QOpenGLShaderProgram(QObject *parent = Q_NULLPTR); + explicit QOpenGLShaderProgram(QObject *parent = nullptr); virtual ~QOpenGLShaderProgram(); bool addShader(QOpenGLShader *shader); @@ -306,7 +306,7 @@ public: void setUniformValueArray(const char *name, const QMatrix4x3 *values, int count); void setUniformValueArray(const char *name, const QMatrix4x4 *values, int count); - static bool hasOpenGLShaderPrograms(QOpenGLContext *context = Q_NULLPTR); + static bool hasOpenGLShaderPrograms(QOpenGLContext *context = nullptr); private Q_SLOTS: void shaderDestroyed(); diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index 766d4a327a..3563f1b5d3 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/opengl/qopengltexture.cpp @@ -43,6 +43,7 @@ #include "qopenglfunctions.h" #include <QtGui/qcolor.h> #include <QtGui/qopenglcontext.h> +#include <QtCore/qdebug.h> #include <private/qobject_p.h> #include <private/qopenglcontext_p.h> @@ -190,11 +191,20 @@ void QOpenGLTexturePrivate::destroy() return; } QOpenGLContext *currentContext = QOpenGLContext::currentContext(); - if (!currentContext || !QOpenGLContext::areSharing(currentContext, context)) { - qWarning("Texture is not valid in the current context.\n" + if (!currentContext) { + qWarning("QOpenGLTexturePrivate::destroy() called without a current context.\n" "Texture has not been destroyed"); return; } + if (!QOpenGLContext::areSharing(currentContext, context)) { + + qWarning("QOpenGLTexturePrivate::destroy() called but texture context %p" + " is not shared with current context %p.\n" + "Texture has not been destroyed", + static_cast<const void *>(context), + static_cast<const void *>(currentContext)); + return; + } functions->glDeleteTextures(1, &textureId); @@ -4661,4 +4671,40 @@ float QOpenGLTexture::levelofDetailBias() const return d->levelOfDetailBias; } +#ifndef QT_NO_DEBUG_STREAM +QDebug operator<<(QDebug debug, const QOpenGLTexture *t) +{ + QDebugStateSaver saver(debug); + debug.nospace(); + debug << "QOpenGLTexture("; + if (t) { + const QOpenGLTexturePrivate *d = t->d_ptr.data(); + debug << d->target << ", bindingTarget=" << d->bindingTarget + << ", size=[" << d->dimensions[0] + << ", " << d->dimensions[1]; + if (d->target == QOpenGLTexture::Target3D) + debug << ", " << d->dimensions[2]; + debug << "], format=" << d->format << ", formatClass=" << d->formatClass; + if (t->isCreated()) + debug << ", textureId=" << d->textureId; + if (t->isBound()) + debug << ", [bound]"; + if (t->isTextureView()) + debug << ", [view]"; + if (d->fixedSamplePositions) + debug << ", [fixedSamplePositions]"; + debug << ", mipLevels=" << d->requestedMipLevels << ", layers=" << d->layers + << ", faces=" << d->faces << ", samples=" << d->samples + << ", depthStencilMode=" << d->depthStencilMode << ", comparisonFunction=" + << d->comparisonFunction << ", comparisonMode=" << d->comparisonMode + << ", features=" << d->features << ", minificationFilter=" << d->minFilter + << ", magnificationFilter=" << d->magFilter << ", wrapMode=" << d->wrapModes[0]; + } else { + debug << '0'; + } + debug << ')'; + return debug; +} +#endif // QT_NO_DEBUG_STREAM + QT_END_NAMESPACE diff --git a/src/gui/opengl/qopengltexture.h b/src/gui/opengl/qopengltexture.h index 6e6f7ef1f2..c0c5283374 100644 --- a/src/gui/opengl/qopengltexture.h +++ b/src/gui/opengl/qopengltexture.h @@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE +class QDebug; class QOpenGLTexturePrivate; class QOpenGLPixelTransferOptions; @@ -458,60 +459,60 @@ public: #if QT_DEPRECATED_SINCE(5, 3) QT_DEPRECATED void setData(int mipLevel, int layer, CubeMapFace cubeFace, PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + void *data, const QOpenGLPixelTransferOptions * const options = nullptr); QT_DEPRECATED void setData(int mipLevel, int layer, PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + void *data, const QOpenGLPixelTransferOptions * const options = nullptr); QT_DEPRECATED void setData(int mipLevel, PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + void *data, const QOpenGLPixelTransferOptions * const options = nullptr); QT_DEPRECATED void setData(PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + void *data, const QOpenGLPixelTransferOptions * const options = nullptr); #endif // QT_DEPRECATED_SINCE(5, 3) void setData(int mipLevel, int layer, CubeMapFace cubeFace, PixelFormat sourceFormat, PixelType sourceType, - const void *data, const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const void *data, const QOpenGLPixelTransferOptions * const options = nullptr); void setData(int mipLevel, int layer, int layerCount, CubeMapFace cubeFace, PixelFormat sourceFormat, PixelType sourceType, - const void *data, const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const void *data, const QOpenGLPixelTransferOptions * const options = nullptr); void setData(int mipLevel, int layer, PixelFormat sourceFormat, PixelType sourceType, - const void *data, const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const void *data, const QOpenGLPixelTransferOptions * const options = nullptr); void setData(int mipLevel, PixelFormat sourceFormat, PixelType sourceType, - const void *data, const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const void *data, const QOpenGLPixelTransferOptions * const options = nullptr); void setData(PixelFormat sourceFormat, PixelType sourceType, - const void *data, const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const void *data, const QOpenGLPixelTransferOptions * const options = nullptr); // Compressed data upload // ### Qt 6: remove the non-const void * overloads #if QT_DEPRECATED_SINCE(5, 3) QT_DEPRECATED void setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace, int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const QOpenGLPixelTransferOptions * const options = nullptr); QT_DEPRECATED void setCompressedData(int mipLevel, int layer, int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const QOpenGLPixelTransferOptions * const options = nullptr); QT_DEPRECATED void setCompressedData(int mipLevel, int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const QOpenGLPixelTransferOptions * const options = nullptr); QT_DEPRECATED void setCompressedData(int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const QOpenGLPixelTransferOptions * const options = nullptr); #endif // QT_DEPRECATED_SINCE(5, 3) void setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace, int dataSize, const void *data, - const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const QOpenGLPixelTransferOptions * const options = nullptr); void setCompressedData(int mipLevel, int layer, int layerCount, CubeMapFace cubeFace, int dataSize, const void *data, - const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const QOpenGLPixelTransferOptions * const options = nullptr); void setCompressedData(int mipLevel, int layer, int dataSize, const void *data, - const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const QOpenGLPixelTransferOptions * const options = nullptr); void setCompressedData(int mipLevel, int dataSize, const void *data, - const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const QOpenGLPixelTransferOptions * const options = nullptr); void setCompressedData(int dataSize, const void *data, - const QOpenGLPixelTransferOptions * const options = Q_NULLPTR); + const QOpenGLPixelTransferOptions * const options = nullptr); // Helpful overloads for setData void setData(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps); @@ -613,6 +614,10 @@ public: void setLevelofDetailBias(float bias); float levelofDetailBias() const; +#ifndef QT_NO_DEBUG_STREAM + friend Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QOpenGLTexture *t); +#endif + private: Q_DISABLE_COPY(QOpenGLTexture) Q_DECLARE_PRIVATE(QOpenGLTexture) @@ -621,6 +626,10 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLTexture::Features) +#ifndef QT_NO_DEBUG_STREAM +Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QOpenGLTexture *t); +#endif + QT_END_NAMESPACE #endif // QT_NO_OPENGL diff --git a/src/gui/opengl/qopengltexturecache_p.h b/src/gui/opengl/qopengltexturecache_p.h index 4a438c8d95..b9d7df91e3 100644 --- a/src/gui/opengl/qopengltexturecache_p.h +++ b/src/gui/opengl/qopengltexturecache_p.h @@ -82,8 +82,8 @@ public: void invalidate(qint64 key); - void invalidateResource() Q_DECL_OVERRIDE; - void freeResource(QOpenGLContext *ctx) Q_DECL_OVERRIDE; + void invalidateResource() override; + void freeResource(QOpenGLContext *ctx) override; private: GLuint bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureCache::BindOptions options); diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h index 6a1550dbed..0b7b5f6082 100644 --- a/src/gui/opengl/qopengltextureglyphcache_p.h +++ b/src/gui/opengl/qopengltextureglyphcache_p.h @@ -81,7 +81,7 @@ public: #endif } - void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *context) override { QOpenGLContext *ctx = context; #ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG @@ -93,7 +93,7 @@ public: ctx->functions()->glDeleteTextures(1, &m_texture); } - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_texture = 0; m_fbo = 0; @@ -113,12 +113,12 @@ public: QOpenGLTextureGlyphCache(QFontEngine::GlyphFormat glyphFormat, const QTransform &matrix); ~QOpenGLTextureGlyphCache(); - virtual void createTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void resizeTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) Q_DECL_OVERRIDE; - virtual int glyphPadding() const Q_DECL_OVERRIDE; - virtual int maxTextureWidth() const Q_DECL_OVERRIDE; - virtual int maxTextureHeight() const Q_DECL_OVERRIDE; + virtual void createTextureData(int width, int height) override; + virtual void resizeTextureData(int width, int height) override; + virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) override; + virtual int glyphPadding() const override; + virtual int maxTextureWidth() const override; + virtual int maxTextureHeight() const override; inline GLuint texture() const { QOpenGLTextureGlyphCache *that = const_cast<QOpenGLTextureGlyphCache *>(this); diff --git a/src/gui/opengl/qopengltimerquery.h b/src/gui/opengl/qopengltimerquery.h index 7b9ab850e2..27da74a3fb 100644 --- a/src/gui/opengl/qopengltimerquery.h +++ b/src/gui/opengl/qopengltimerquery.h @@ -56,7 +56,7 @@ class Q_GUI_EXPORT QOpenGLTimerQuery : public QObject Q_OBJECT public: - explicit QOpenGLTimerQuery(QObject *parent = Q_NULLPTR); + explicit QOpenGLTimerQuery(QObject *parent = nullptr); ~QOpenGLTimerQuery(); bool create(); @@ -84,7 +84,7 @@ class Q_GUI_EXPORT QOpenGLTimeMonitor : public QObject Q_OBJECT public: - explicit QOpenGLTimeMonitor(QObject *parent = Q_NULLPTR); + explicit QOpenGLTimeMonitor(QObject *parent = nullptr); ~QOpenGLTimeMonitor(); void setSampleCount(int sampleCount); diff --git a/src/gui/opengl/qopenglversionfunctions.h b/src/gui/opengl/qopenglversionfunctions.h index 63209cf392..3af1ed0466 100644 --- a/src/gui/opengl/qopenglversionfunctions.h +++ b/src/gui/opengl/qopenglversionfunctions.h @@ -193,7 +193,7 @@ class QAbstractOpenGLFunctionsPrivate { public: QAbstractOpenGLFunctionsPrivate() - : owningContext(Q_NULLPTR), + : owningContext(nullptr), initialized(false) {} diff --git a/src/gui/opengl/qopenglvertexarrayobject.h b/src/gui/opengl/qopenglvertexarrayobject.h index a8153ea40b..b81ae6a2a9 100644 --- a/src/gui/opengl/qopenglvertexarrayobject.h +++ b/src/gui/opengl/qopenglvertexarrayobject.h @@ -56,7 +56,7 @@ class Q_GUI_EXPORT QOpenGLVertexArrayObject : public QObject Q_OBJECT public: - explicit QOpenGLVertexArrayObject(QObject* parent = Q_NULLPTR); + explicit QOpenGLVertexArrayObject(QObject* parent = nullptr); ~QOpenGLVertexArrayObject(); bool create(); diff --git a/src/gui/opengl/qopenglvertexarrayobject_p.h b/src/gui/opengl/qopenglvertexarrayobject_p.h index 937921765b..fd3a6f0f89 100644 --- a/src/gui/opengl/qopenglvertexarrayobject_p.h +++ b/src/gui/opengl/qopenglvertexarrayobject_p.h @@ -70,10 +70,10 @@ class QOpenGLVertexArrayObjectHelper public: explicit inline QOpenGLVertexArrayObjectHelper(QOpenGLContext *context) - : GenVertexArrays(Q_NULLPTR) - , DeleteVertexArrays(Q_NULLPTR) - , BindVertexArray(Q_NULLPTR) - , IsVertexArray(Q_NULLPTR) + : GenVertexArrays(nullptr) + , DeleteVertexArrays(nullptr) + , BindVertexArray(nullptr) + , IsVertexArray(nullptr) { qtInitializeVertexArrayObjectHelper(this, context); } |