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

QtOpenGL: Disambiguate class name QTextureBinder

Browse Source 
It occurs twice, causing a clash in CMake Unity (Jumbo) builds.

Task-number: QTBUG-109394
Change-Id: I39341af72cfa406d80c598a56db9e02f80c61a9b
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 135a792940ed3a7ed2cfc632e2b11477edea7706)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Friedemann Kleint 2023-01-12 15:35:37 +01:00 committed by Qt Cherry-pick Bot
parent b23437a215
commit b2789fd47c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/opengl/qopengltextureblitter.cpp
View File

@ -169,14 +169,14 @@ static const GLfloat texture_buffer_data[] = {
1, 1 1, 1
}; };
class TextureBinder class QBlitterTextureBinder
{ {
public: public:
TextureBinder(GLenum target, GLuint textureId) : m_target(target) explicit QBlitterTextureBinder(GLenum target, GLuint textureId) : m_target(target)
{ {
QOpenGLContext::currentContext()->functions()->glBindTexture(m_target, textureId); QOpenGLContext::currentContext()->functions()->glBindTexture(m_target, textureId);
} }
~TextureBinder() ~QBlitterTextureBinder()
{ {
QOpenGLContext::currentContext()->functions()->glBindTexture(m_target, 0); QOpenGLContext::currentContext()->functions()->glBindTexture(m_target, 0);
} }
@ -319,7 +319,7 @@ void QOpenGLTextureBlitterPrivate::blit(GLuint texture,
const QMatrix4x4 &targetTransform, const QMatrix4x4 &targetTransform,
const QMatrix3x3 &sourceTransform) const QMatrix3x3 &sourceTransform)
{ {
TextureBinder binder(currentTarget, texture); QBlitterTextureBinder binder(currentTarget, texture);
if (!prepareProgram(targetTransform)) if (!prepareProgram(targetTransform))
return; return;
@ -336,7 +336,7 @@ void QOpenGLTextureBlitterPrivate::blit(GLuint texture,
const QMatrix4x4 &targetTransform, const QMatrix4x4 &targetTransform,
QOpenGLTextureBlitter::Origin origin) QOpenGLTextureBlitter::Origin origin)
{ {
TextureBinder binder(currentTarget, texture); QBlitterTextureBinder binder(currentTarget, texture);
if (!prepareProgram(targetTransform)) if (!prepareProgram(targetTransform))
return; return;