From f669d1708c1009adc7d82d42bf550e0d971e827f Mon Sep 17 00:00:00 2001
From: Michael Dippold <mike@dippold.com>
Date: Mon, 1 Feb 2016 17:51:28 -0800
Subject: [PATCH] Add correct extension lookup to getExtension
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Previous change corrected the getSupportedExtensions function, this
change fixes the getExtension function.
Change-Id: Ie4d36366d3261bd65c7d5f6677902781156f9ad2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
---
src/imports/qtcanvas3d/context3d.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/imports/qtcanvas3d/context3d.cpp b/src/imports/qtcanvas3d/context3d.cpp
index 232bc4f..9e2c488 100644
--- a/src/imports/qtcanvas3d/context3d.cpp
+++ b/src/imports/qtcanvas3d/context3d.cpp
@@ -6082,7 +6082,7 @@ QVariant CanvasContext::getExtension(const QString &name)
m_textureProviderExt = new CanvasTextureProvider(this, this);
return QVariant::fromValue(m_textureProviderExt);
} else if (upperCaseName == QStringLiteral("OES_STANDARD_DERIVATIVES") &&
- m_extensions.contains("OES_standard_derivatives")) {
+ m_extensions.contains("GL_OES_standard_derivatives")) {
if (!m_standardDerivatives)
m_standardDerivatives = new QObject(this);
return QVariant::fromValue(m_standardDerivatives);
@@ -6092,7 +6092,7 @@ QVariant CanvasContext::getExtension(const QString &name)
m_compressedTextureS3TC = new CompressedTextureS3TC(this);
return QVariant::fromValue(m_compressedTextureS3TC);
} else if (upperCaseName == QStringLiteral("WEBGL_COMPRESSED_TEXTURE_PVRTC") &&
- m_extensions.contains("IMG_texture_compression_pvrtc")) {
+ m_extensions.contains("GL_IMG_texture_compression_pvrtc")) {
if (!m_compressedTexturePVRTC)
m_compressedTexturePVRTC = new CompressedTexturePVRTC(this);
return QVariant::fromValue(m_compressedTexturePVRTC);
--
GitLab