Make QQuickShaderEffectMesh generic

There is nothing GL-specific here (apart from the attribute name list but
that will likely remain that way with non-GL backends as well). By moving a
few constants it can now be built unconditionally.

Change-Id: I866b7b5c0262588a39818b177455f6276f8d584b
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

1 files changed, 7 insertions, 20 deletions

diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index 41b7ea3896..a2c2ebb380 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -50,25 +50,12 @@
 
 #include "qquickimage_p.h"
 #include "qquickshadereffectsource_p.h"
+#include "qquickshadereffectmesh_p.h"
 
 #include <QtCore/qsignalmapper.h>
-#include <QtGui/qopenglframebufferobject.h>
 
 QT_BEGIN_NAMESPACE
 
-static const char qt_position_attribute_name[] = "qt_Vertex";
-static const char qt_texcoord_attribute_name[] = "qt_MultiTexCoord0";
-
-const char *qtPositionAttributeName()
-{
-    return qt_position_attribute_name;
-}
-
-const char *qtTexCoordAttributeName()
-{
-    return qt_texcoord_attribute_name;
-}
-
 namespace {
 
     enum VariableQualifier {
@@ -256,14 +243,14 @@ void QQuickShaderEffectCommon::updateParseLog(bool ignoreAttributes)
 {
     parseLog.clear();
     if (!ignoreAttributes) {
-        if (!attributes.contains(qt_position_attribute_name)) {
+        if (!attributes.contains(qtPositionAttributeName())) {
             parseLog += QLatin1String("Warning: Missing reference to \'");
-            parseLog += QLatin1String(qt_position_attribute_name);
+            parseLog += QLatin1String(qtPositionAttributeName());
             parseLog += QLatin1String("\'.\n");
         }
-        if (!attributes.contains(qt_texcoord_attribute_name)) {
+        if (!attributes.contains(qtTexCoordAttributeName())) {
             parseLog += QLatin1String("Warning: Missing reference to \'");
-            parseLog += QLatin1String(qt_texcoord_attribute_name);
+            parseLog += QLatin1String(qtTexCoordAttributeName());
             parseLog += QLatin1String("\'.\n");
         }
     }
@@ -339,8 +326,8 @@ void QQuickShaderEffectCommon::updateShader(QQuickItem *item, Key::ShaderType sh
     if (code.isEmpty()) {
         // Optimize for default code.
         if (shaderType == Key::VertexShader) {
-            attributes.append(QByteArray(qt_position_attribute_name));
-            attributes.append(QByteArray(qt_texcoord_attribute_name));
+            attributes.append(QByteArray(qtPositionAttributeName()));
+            attributes.append(QByteArray(qtTexCoordAttributeName()));
             UniformData d;
             d.name = "qt_Matrix";
             d.specialType = UniformData::Matrix;