From a48ca7e319bb7ad95a31638b2493560a58a4b8a3 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Date: Thu, 2 Jun 2016 16:49:43 +0200
Subject: Avoid ifdefed enum

Do it like in QSGGeometry: use the values directly to avoid the GL header
dependency.

Change-Id: Ia83dea5cbbab7dfee8b88d1b01fcfcb51ad41fc1
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
---
 src/quick/items/qquickshadereffectsource_p.h | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/quick/items/qquickshadereffectsource_p.h')

diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
index 5d7ed2ad2d..680ba85aa1 100644
--- a/src/quick/items/qquickshadereffectsource_p.h
+++ b/src/quick/items/qquickshadereffectsource_p.h
@@ -93,19 +93,12 @@ public:
         Repeat
     };
     Q_ENUM(WrapMode)
-#ifndef QT_NO_OPENGL
-    enum Format {
-        Alpha = GL_ALPHA,
-        RGB = GL_RGB,
-        RGBA = GL_RGBA
-    };
-#else
+    // Equivalents to GL_ALPHA and similar type constants.
     enum Format {
         Alpha = 0x1906,
-        RGB,
-        RGBA
+        RGB = 0x1907,
+        RGBA = 0x1908
     };
-#endif
     Q_ENUM(Format)
 
     enum TextureMirroring {
-- 
cgit v1.2.3