From e5a277fdd539c0de5e533b49a038e22929ace1dc Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Tue, 16 Feb 2010 09:03:42 +1000
Subject: Fix alpha check for OpenGL/ES in GL2 paint engine

GL_RGB5 and GL_RGB8 don't exist on OpenGL/ES systems.

Reviewed-by: Julian de Bhal
---
 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 12ac69d..74ec97b 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1750,7 +1750,11 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
     case QInternal::FramebufferObject:
         {
             GLenum f = static_cast<QGLFramebufferObject *>(pdev)->format().internalTextureFormat();
+#ifndef QT_OPENGL_ES
             d->deviceHasAlpha = (f != GL_RGB && f != GL_RGB5 && f != GL_RGB8);
+#else
+            d->deviceHasAlpha = (f == GL_RGBA);
+#endif
         }
         break;
     default:
-- 
cgit v0.12