1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: gl: Have a way to state GL_TEXTURE_RECTANGLE is wanted

Browse Source 
Added specifically to support the deprecated CVOpenGLTextureCache on
macOS, because Qt Multimedia still needs a way to use that when the
applications requests using OpenGL instead of Metal.

Follow what we did for GL_TEXTURE_EXTERNAL_OES, and add a flag that
simply makes all our glBindTexture calls use the
GL_TEXTURE_RECTANGLE[_ARB] target.

Change-Id: If818b13a9f520cdb8bdc16de84a3ca0e18ad6c33
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit d55a6891d18ee576a6f3e2c510eefee4a1639d7f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Laszlo Agocs 2021-09-16 13:07:20 +02:00 committed by Qt Cherry-pick Bot
parent a9bba3a788
commit 24126e6604
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/rhi/qrhi.cpp
View File

@ -2450,6 +2450,13 @@ bool QRhiRenderBuffer::createFrom(NativeRenderBuffer src)
render target's color attachment refers to a slice in range [0..depth-1]. render target's color attachment refers to a slice in range [0..depth-1].
The underlying graphics API may not support 3D textures at run time. The underlying graphics API may not support 3D textures at run time.
Support is indicated by the QRhi::ThreeDimensionalTextures feature. Support is indicated by the QRhi::ThreeDimensionalTextures feature.
\value TextureRectangleGL The texture should use the GL_TEXTURE_RECTANGLE
target with OpenGL. This flag is ignored with other graphics APIs. Just
like ExternalOES, this flag is useful when working with platform APIs where
native OpenGL texture objects received from the platform are wrapped in a
QRhiTexture, and the platform can only provide textures for a non-2D
texture target.
*/ */
/*! /*!

3
src/gui/rhi/qrhi_p.h
View File

@ -778,7 +778,8 @@ public:
UsedWithLoadStore = 1 << 7, UsedWithLoadStore = 1 << 7,
UsedAsCompressedAtlas = 1 << 8, UsedAsCompressedAtlas = 1 << 8,
ExternalOES = 1 << 9, ExternalOES = 1 << 9,
ThreeDimensional = 1 << 10 ThreeDimensional = 1 << 10,
TextureRectangleGL = 1 << 11
}; };
Q_DECLARE_FLAGS(Flags, Flag) Q_DECLARE_FLAGS(Flags, Flag)

6
src/gui/rhi/qrhigles2.cpp
View File

@ -361,6 +361,10 @@ QT_BEGIN_NAMESPACE
#define GL_TEXTURE_WRAP_R 0x8072 #define GL_TEXTURE_WRAP_R 0x8072
#endif #endif
#ifndef GL_TEXTURE_RECTANGLE
#define GL_TEXTURE_RECTANGLE 0x84F5
#endif
/*! /*!
Constructs a new QRhiGles2InitParams. Constructs a new QRhiGles2InitParams.
@ -4579,6 +4583,8 @@ bool QGles2Texture::prepareCreate(QSize *adjustedSize)
: m_sampleCount > 1 ? GL_TEXTURE_2D_MULTISAMPLE : (is3D ? GL_TEXTURE_3D : GL_TEXTURE_2D); : m_sampleCount > 1 ? GL_TEXTURE_2D_MULTISAMPLE : (is3D ? GL_TEXTURE_3D : GL_TEXTURE_2D);
if (m_flags.testFlag(ExternalOES)) if (m_flags.testFlag(ExternalOES))
target = GL_TEXTURE_EXTERNAL_OES; target = GL_TEXTURE_EXTERNAL_OES;
else if (m_flags.testFlag(TextureRectangleGL))
target = GL_TEXTURE_RECTANGLE;
mipLevelCount = hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1; mipLevelCount = hasMipMaps ? rhiD->q->mipLevelsForSize(size) : 1;
gltype = GL_UNSIGNED_BYTE; gltype = GL_UNSIGNED_BYTE;