From b2789fd47cc38d41dc9f4010957eb64ceb121b2b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 12 Jan 2023 15:35:37 +0100 Subject: [PATCH] QtOpenGL: Disambiguate class name QTextureBinder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It occurs twice, causing a clash in CMake Unity (Jumbo) builds. Task-number: QTBUG-109394 Change-Id: I39341af72cfa406d80c598a56db9e02f80c61a9b Reviewed-by: Jörg Bornemann (cherry picked from commit 135a792940ed3a7ed2cfc632e2b11477edea7706) Reviewed-by: Qt Cherry-pick Bot --- src/opengl/qopengltextureblitter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/opengl/qopengltextureblitter.cpp b/src/opengl/qopengltextureblitter.cpp index 2b43afc3b6b..5f58876f326 100644 --- a/src/opengl/qopengltextureblitter.cpp +++ b/src/opengl/qopengltextureblitter.cpp @@ -169,14 +169,14 @@ static const GLfloat texture_buffer_data[] = { 1, 1 }; -class TextureBinder +class QBlitterTextureBinder { 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); } - ~TextureBinder() + ~QBlitterTextureBinder() { QOpenGLContext::currentContext()->functions()->glBindTexture(m_target, 0); } @@ -319,7 +319,7 @@ void QOpenGLTextureBlitterPrivate::blit(GLuint texture, const QMatrix4x4 &targetTransform, const QMatrix3x3 &sourceTransform) { - TextureBinder binder(currentTarget, texture); + QBlitterTextureBinder binder(currentTarget, texture); if (!prepareProgram(targetTransform)) return; @@ -336,7 +336,7 @@ void QOpenGLTextureBlitterPrivate::blit(GLuint texture, const QMatrix4x4 &targetTransform, QOpenGLTextureBlitter::Origin origin) { - TextureBinder binder(currentTarget, texture); + QBlitterTextureBinder binder(currentTarget, texture); if (!prepareProgram(targetTransform)) return;