From: Gunnar Sletta <gunnar.sletta@digia.com>
Date: Mon, 18 Mar 2013 12:22:54 +0000 (+0100)
Subject: Remove the APPLE_texture_format path
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=f6969ffab5547396bb31570a72bfb3430a0d3b37;p=konrad%2Fqtdeclarative.git

Remove the APPLE_texture_format path

It is untested and is causing problems elsewhere.

Change-Id: I412f820d14c1632e3d1000b627231d8f78e792b5
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---

diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index 18b5627..ad98fe9 100644
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -675,8 +675,6 @@ void QSGPlainTexture::bind()
 #ifdef QT_OPENGL_ES
         internalFormat = GL_BGRA;
 #endif
-    } else if (strstr(extensions, "GL_APPLE_texture_format_BGRA8888")) {
-        externalFormat = GL_BGRA;
     } else if (strstr(extensions, "GL_EXT_texture_format_BGRA8888")
                || strstr(extensions, "GL_IMG_texture_format_BGRA8888")) {
         externalFormat = GL_BGRA;