From 7ec40ab52ea5434791a8d02a8eb20724f24cefc6 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 14 Dec 2015 14:14:16 +0100 Subject: QOpenGLTexturePrivate: remove unused member variable Change-Id: I4d897c522087654649547c0ca4750ba4dbfa5cbf Reviewed-by: Sean Harmer --- src/gui/opengl/qopengltexture_p.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/gui/opengl') diff --git a/src/gui/opengl/qopengltexture_p.h b/src/gui/opengl/qopengltexture_p.h index ac9d44db42..40ceb1936c 100644 --- a/src/gui/opengl/qopengltexture_p.h +++ b/src/gui/opengl/qopengltexture_p.h @@ -156,7 +156,6 @@ public: bool autoGenerateMipMaps; bool storageAllocated; - QPair glVersion; QOpenGLTextureHelper *texFuncs; QOpenGLTexture::Features features; -- cgit v1.2.3 From a5b254ff23b9ca3099a9f13e93727e1cd52c8720 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 14 Dec 2015 14:16:12 +0100 Subject: QOpenGLTexture: check textureId for knowing whether a texture was created Change-Id: I0775ad9538a7793dc6628abe4556404634ae0462 Reviewed-by: Sean Harmer --- src/gui/opengl/qopengltexture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/opengl') diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index 301b2ad13d..33c0d0bb60 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/opengl/qopengltexture.cpp @@ -175,7 +175,7 @@ bool QOpenGLTexturePrivate::create() void QOpenGLTexturePrivate::destroy() { - if (!context) { + if (!textureId) { // not created or already destroyed return; } -- cgit v1.2.3 From 08ee579cf025ad868bb405835b57d31e512b6fd6 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 14 Dec 2015 14:23:46 +0100 Subject: QOpenGLTexture: fix the number of faces returned by faces() Change-Id: I7bf08eee357fb9641ff9118edcf97809f98605b7 Reviewed-by: Sean Harmer --- src/gui/opengl/qopengltexture.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gui/opengl') diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index 33c0d0bb60..02dee5a90a 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/opengl/qopengltexture.cpp @@ -97,9 +97,11 @@ QOpenGLTexturePrivate::QOpenGLTexturePrivate(QOpenGLTexture::Target textureTarge break; case QOpenGLTexture::TargetCubeMap: bindingTarget = QOpenGLTexture::BindingTargetCubeMap; + faces = 6; break; case QOpenGLTexture::TargetCubeMapArray: bindingTarget = QOpenGLTexture::BindingTargetCubeMapArray; + faces = 6; break; case QOpenGLTexture::Target2DMultisample: bindingTarget = QOpenGLTexture::BindingTarget2DMultisample; -- cgit v1.2.3