diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-12 15:35:37 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-13 07:58:37 +0100 |
commit | 135a792940ed3a7ed2cfc632e2b11477edea7706 (patch) | |
tree | 27b535a092c4b5aec19e5f8edb8fdb986b5cf850 /src | |
parent | 9615e7f9e538af4ad212f4f71d1364c64b18542d (diff) |
QtOpenGL: Disambiguate class name QTextureBinder
It occurs twice, causing a clash in CMake Unity (Jumbo) builds.
Task-number: QTBUG-109394
Pick-to: 6.5
Change-Id: I39341af72cfa406d80c598a56db9e02f80c61a9b
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/opengl/qopengltextureblitter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/opengl/qopengltextureblitter.cpp b/src/opengl/qopengltextureblitter.cpp index 2b43afc3b6..5f58876f32 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; |