diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2024-04-10 13:43:47 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2024-04-16 13:31:07 +0200 |
| commit | 7aaa6a60448f5be05373367abaa37a1fa56ab5c7 (patch) | |
| tree | 4e8bcdef720215b837a19d6c7f5247ed252e1d9c /src/opengl/qopenglversionfunctions.h | |
| parent | 655b98482e8339b287fb040fd25013dc1232a43d (diff) | |
Correct the internal signatures in the GL 4.5 func wrappers
There are 9 functions in the 4.5 API that were initially specified
to use GLsizei, but later "magically" became GLsizeiptr (i.e.
64-bit or 32-bit depending on the arch).
The current gl.xml, unlike old ones, uses GLsizeiptr, as do the
extension headers and most of the online docs, except some that of the
reference pages are stuck with GLsizei.
Assuming that today's OpenGL implementations expect GLsizeiptr, fix
the the internal signatures, so that calling into the GL implementation
is done using the correct argument sizes.
In addition, add GLsizeiptr signatures in the public API guarded with
>= QT_VERSION(7, 0, 0).
Pick-to: 6.7 6.6 6.5
Fixes: QTBUG-67807
Change-Id: Ifc7e97b0479a186000a56709c37ba7f77b6f1ff2
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'src/opengl/qopenglversionfunctions.h')
| -rw-r--r-- | src/opengl/qopenglversionfunctions.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/opengl/qopenglversionfunctions.h b/src/opengl/qopenglversionfunctions.h index c1942548dba..dc01b940bba 100644 --- a/src/opengl/qopenglversionfunctions.h +++ b/src/opengl/qopenglversionfunctions.h @@ -1179,25 +1179,25 @@ public: F(void, NamedFramebufferParameteri, (GLuint framebuffer, GLenum pname, GLint param)) \ F(void, NamedFramebufferRenderbuffer, (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) \ F(void, CreateFramebuffers, (GLsizei n, GLuint *framebuffers)) \ - F(void, GetNamedBufferSubData, (GLuint buffer, GLintptr offset, GLsizei size, void *data)) \ + F(void, GetNamedBufferSubData, (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data)) \ F(void, GetNamedBufferPointerv, (GLuint buffer, GLenum pname, GLvoid* *params)) \ F(void, GetNamedBufferParameteri64v, (GLuint buffer, GLenum pname, GLint64 *params)) \ F(void, GetNamedBufferParameteriv, (GLuint buffer, GLenum pname, GLint *params)) \ - F(void, FlushMappedNamedBufferRange, (GLuint buffer, GLintptr offset, GLsizei length)) \ + F(void, FlushMappedNamedBufferRange, (GLuint buffer, GLintptr offset, GLsizeiptr length)) \ F(GLboolean, UnmapNamedBuffer, (GLuint buffer)) \ - F(GLvoid *, MapNamedBufferRange, (GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access)) \ + F(GLvoid *, MapNamedBufferRange, (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access)) \ F(GLvoid *, MapNamedBuffer, (GLuint buffer, GLenum access)) \ - F(void, ClearNamedBufferSubData, (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data)) \ + F(void, ClearNamedBufferSubData, (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data)) \ F(void, ClearNamedBufferData, (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data)) \ - F(void, CopyNamedBufferSubData, (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size)) \ - F(void, NamedBufferSubData, (GLuint buffer, GLintptr offset, GLsizei size, const void *data)) \ - F(void, NamedBufferData, (GLuint buffer, GLsizei size, const void *data, GLenum usage)) \ - F(void, NamedBufferStorage, (GLuint buffer, GLsizei size, const void *data, GLbitfield flags)) \ + F(void, CopyNamedBufferSubData, (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)) \ + F(void, NamedBufferSubData, (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data)) \ + F(void, NamedBufferData, (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage)) \ + F(void, NamedBufferStorage, (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags)) \ F(void, CreateBuffers, (GLsizei n, GLuint *buffers)) \ F(void, GetTransformFeedbacki64_v,(GLuint xfb, GLenum pname, GLuint index, GLint64 *param)) \ F(void, GetTransformFeedbacki_v,(GLuint xfb, GLenum pname, GLuint index, GLint *param)) \ F(void, GetTransformFeedbackiv, (GLuint xfb, GLenum pname, GLint *param)) \ - F(void, TransformFeedbackBufferRange, (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size)) \ + F(void, TransformFeedbackBufferRange, (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) \ F(void, TransformFeedbackBufferBase, (GLuint xfb, GLuint index, GLuint buffer)) \ F(void, CreateTransformFeedbacks, (GLsizei n, GLuint *ids)) \ F(void, ClipControl, (GLenum origin, GLenum depth)) \ |