diff options
| author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-10-30 11:56:28 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-10-30 10:01:22 +0000 |
| commit | 0dbded1506abf172b7b3cf7685bdcb30c7b8012d (patch) | |
| tree | a0cdb79e6a482697cc96c3300b0502595b42d4b1 /src/render/texture/texture.cpp | |
| parent | 9b9f34701f47824e8201453d148152fb0855f98a (diff) | |
d-pointer classes, private/public changes
Change-Id: I4ca133aebad0c088296ab293f95f0a6d76d18395
Task-number: QTBUG-39946
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/texture/texture.cpp')
| -rw-r--r-- | src/render/texture/texture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp index c665e3cf8..f17425705 100644 --- a/src/render/texture/texture.cpp +++ b/src/render/texture/texture.cpp @@ -42,7 +42,7 @@ #include <QOpenGLTexture> #include <QOpenGLPixelTransferOptions> #include <Qt3DRender/qtexture.h> -#include <Qt3DRender/texturedata.h> +#include <Qt3DRender/qtexturedata.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/private/qaspectmanager_p.h> #include <Qt3DRender/private/managers_p.h> @@ -298,7 +298,7 @@ QOpenGLTexture *Texture::buildGLTexture() } // RenderThread -void Texture::setToGLTexture(TextureImage *rImg, TexImageData *imgData) +void Texture::setToGLTexture(TextureImage *rImg, QTexImageData *imgData) { Q_ASSERT(m_gl && m_gl->isCreated() && m_gl->isStorageAllocated()); // ensure we don't accidently cause a detach / copy of the raw bytes @@ -536,7 +536,7 @@ void Texture::updateAndLoadTextureImage() img->unsetDirty(); continue; } - TexImageData *data = m_textureDataManager->data(img->textureDataHandle()); + QTexImageData *data = m_textureDataManager->data(img->textureDataHandle()); if (data != Q_NULLPTR) { setToGLTexture(img, data); dnas.append(img->dna()); |