From 43735342b5b49be28d27b724ad8cdca5eedf28c3 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 9 Sep 2020 17:24:18 +0200 Subject: [PATCH] QOpenGLTexture: Remove obsolete data upload overloads Address ### Qt 6 comment Change-Id: I2952175ec72c5c4c7b4e518754fb1bc6f88b21df Reviewed-by: Laszlo Agocs --- src/opengl/qopengltexture.cpp | 116 ---------------------------------- src/opengl/qopengltexture.h | 29 --------- 2 files changed, 145 deletions(-) diff --git a/src/opengl/qopengltexture.cpp b/src/opengl/qopengltexture.cpp index a306e2eab8..cdf2494505 100644 --- a/src/opengl/qopengltexture.cpp +++ b/src/opengl/qopengltexture.cpp @@ -3646,66 +3646,6 @@ void QOpenGLTexture::setData(int xOffset, int yOffset, int zOffset, sourceType, data, options); } -#if QT_DEPRECATED_SINCE(5, 3) -/*! - \obsolete - \overload - - \sa setCompressedData() -*/ -void QOpenGLTexture::setData(int mipLevel, int layer, CubeMapFace cubeFace, - PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options) -{ - Q_D(QOpenGLTexture); - Q_ASSERT(d->textureId); - if (!isStorageAllocated()) { - qWarning("Cannot set data on a texture that does not have storage allocated.\n" - "To do so call allocateStorage() before this function"); - return; - } - d->setData(mipLevel, layer, 1, cubeFace, sourceFormat, sourceType, data, options); -} - -/*! - \obsolete - \overload -*/ -void QOpenGLTexture::setData(int mipLevel, int layer, - PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options) -{ - Q_D(QOpenGLTexture); - Q_ASSERT(d->textureId); - d->setData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options); -} - -/*! - \obsolete - \overload -*/ -void QOpenGLTexture::setData(int mipLevel, - PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options) -{ - Q_D(QOpenGLTexture); - Q_ASSERT(d->textureId); - d->setData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options); -} - -/*! - \obsolete - \overload -*/ -void QOpenGLTexture::setData(PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options) -{ - Q_D(QOpenGLTexture); - Q_ASSERT(d->textureId); - d->setData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, sourceFormat, sourceType, data, options); -} -#endif - /*! This overload of setData() will allocate storage for you. The pixel data is contained in \a image. Mipmaps are generated by default. @@ -3818,62 +3758,6 @@ void QOpenGLTexture::setCompressedData(int dataSize, const void *data, d->setCompressedData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options); } -#if QT_DEPRECATED_SINCE(5, 3) -/*! - \obsolete - \overload -*/ -void QOpenGLTexture::setCompressedData(int mipLevel, int layer, CubeMapFace cubeFace, - int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options) -{ - Q_D(QOpenGLTexture); - Q_ASSERT(d->textureId); - if (!isStorageAllocated()) { - qWarning("Cannot set data on a texture that does not have storage allocated.\n" - "To do so call allocateStorage() before this function"); - return; - } - d->setCompressedData(mipLevel, layer, 1, cubeFace, dataSize, data, options); -} - -/*! - \obsolete - \overload -*/ -void QOpenGLTexture::setCompressedData(int mipLevel, int layer, int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options) -{ - Q_D(QOpenGLTexture); - Q_ASSERT(d->textureId); - d->setCompressedData(mipLevel, layer, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options); -} - -/*! - \obsolete - \overload -*/ -void QOpenGLTexture::setCompressedData(int mipLevel, int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options) -{ - Q_D(QOpenGLTexture); - Q_ASSERT(d->textureId); - d->setCompressedData(mipLevel, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options); -} - -/*! - \obsolete - \overload -*/ -void QOpenGLTexture::setCompressedData(int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options) -{ - Q_D(QOpenGLTexture); - Q_ASSERT(d->textureId); - d->setCompressedData(0, 0, 1, QOpenGLTexture::CubeMapPositiveX, dataSize, data, options); -} -#endif - /*! Returns \c true if your OpenGL implementation and version supports the texture feature \a feature. diff --git a/src/opengl/qopengltexture.h b/src/opengl/qopengltexture.h index 8eba2724df..28bd5a07cc 100644 --- a/src/opengl/qopengltexture.h +++ b/src/opengl/qopengltexture.h @@ -455,21 +455,6 @@ public: bool isTextureView() const; // Pixel transfer - // ### Qt 6: remove the non-const void * overloads -#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 = nullptr); - QT_DEPRECATED void setData(int mipLevel, int layer, - PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options = nullptr); - QT_DEPRECATED void setData(int mipLevel, - PixelFormat sourceFormat, PixelType sourceType, - void *data, const QOpenGLPixelTransferOptions * const options = nullptr); - QT_DEPRECATED void setData(PixelFormat sourceFormat, PixelType sourceType, - 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 = nullptr); @@ -512,20 +497,6 @@ public: 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 = nullptr); - QT_DEPRECATED void setCompressedData(int mipLevel, int layer, - int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options = nullptr); - QT_DEPRECATED void setCompressedData(int mipLevel, int dataSize, void *data, - const QOpenGLPixelTransferOptions * const options = nullptr); - QT_DEPRECATED void setCompressedData(int dataSize, void *data, - 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 = nullptr);