Remove geometry shader support for Qt 5.0

This commit fixes compilation following commit
57b4a504ff1960c4f78308f46c04922cfd58356e in qtbase which removed the
stubbed geometry shader support from QOpenGLShaderProgram.

This commit will be reverted when geometry shader support is reinstated
in Qt 5.1.

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

2 files changed, 0 insertions, 56 deletions

diff --git a/src/threed/effects/qglshaderprogrameffect.cpp b/src/threed/effects/qglshaderprogrameffect.cpp
index 46d4e3f80..e2dccbaa8 100644
--- a/src/threed/effects/qglshaderprogrameffect.cpp
+++ b/src/threed/effects/qglshaderprogrameffect.cpp
@@ -708,14 +708,6 @@ void QGLShaderProgramEffect::setActive(QGLPainter *painter, bool flag)
             (QOpenGLShader::Vertex, d->vertexShader);
         d->program->addShaderFromSourceCode
             (QOpenGLShader::Fragment, d->fragmentShader);
-        if (!d->geometryShader.isEmpty())
-        {
-            d->program->addShaderFromSourceCode
-                (QOpenGLShader::Geometry, d->geometryShader);
-            d->program->setGeometryInputType(d->geometryInputType);
-            d->program->setGeometryOutputType(d->geometryOutputType);
-
-        }
 
         if (beforeLink()) {
             for (attr = 0; attr < numAttributes; ++attr)
@@ -1003,49 +995,6 @@ void QGLShaderProgramEffect::setFragmentShader(const QByteArray &source)
 }
 
 /*!
-    Sets the type of primitive the program's geometry shader is expecting to
-    recieve from the vertex shader to \a drawingMode.  The default value is
-    GL_TRIANGLE_STRIP.
-
-    If the program has no geometry shader, this has no effect.
-*/
-void QGLShaderProgramEffect::setGeometryInputType(GLenum drawingMode)
-{
-    Q_D(QGLShaderProgramEffect);
-    d->geometryInputType = drawingMode;
-}
-
-/*!
-    Sets what sort of primitives the program's geometry shader will produce
-    to \a drawingMode. The default value is GL_TRIANGLE_STRIP.
-
-    If the program has no geometry shader, this has no effect.
-*/
-void QGLShaderProgramEffect::setGeometryOutputType(GLenum drawingMode)
-{
-    Q_D(QGLShaderProgramEffect);
-    d->geometryOutputType = drawingMode;
-}
-
-/*!
-    Returns the type of primitives this program's geometry shader is expecting.
-*/
-GLenum QGLShaderProgramEffect::geometryInputType()
-{
-    Q_D(QGLShaderProgramEffect);
-    return d->geometryInputType;
-}
-
-/*!
-    Returns the type of primitive this program's geometry shader will produce.
-*/
-GLenum QGLShaderProgramEffect::geometryOutputType()
-{
-    Q_D(QGLShaderProgramEffect);
-    return d->geometryOutputType;
-}
-
-/*!
     Returns the maximum number of lights that are supported by this
     shader program effect.  The default value is 8.
 
diff --git a/src/threed/effects/qglshaderprogrameffect.h b/src/threed/effects/qglshaderprogrameffect.h
index 0a7f43a32..006bbbe65 100644
--- a/src/threed/effects/qglshaderprogrameffect.h
+++ b/src/threed/effects/qglshaderprogrameffect.h
@@ -72,11 +72,6 @@ public:
     void setFragmentShader(const QByteArray &source);
     void setFragmentShaderFromFile(const QString &fileName);
 
-    void setGeometryInputType(GLenum drawingMode);
-    void setGeometryOutputType(GLenum drawingMode);
-    GLenum geometryInputType();
-    GLenum geometryOutputType();
-
     int maximumLights() const;
     void setMaximumLights(int value);