1 files changed, 0 insertions, 81 deletions

diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp
index 4cd34c4..5e84c88 100644
--- a/src/declarative/fx/qfxparticles.cpp
+++ b/src/declarative/fx/qfxparticles.cpp
@@ -40,9 +40,6 @@
 ****************************************************************************/
 
 #include "qfxitem_p.h"
-#if defined(QFX_RENDER_OPENGL)
-#include "gltexture.h"
-#endif
 
 #include <stdlib.h>
 #include <math.h>
@@ -350,11 +347,7 @@ public:
         maxX = minX = maxY = minY = 0;
     }
 
-#if defined(QFX_RENDER_QPAINTER)
     void paintContents(QPainter &p);
-#elif defined(QFX_RENDER_OPENGL2)
-    void paintGLContents(GLPainter &);
-#endif
 
     void updateSize();
 
@@ -375,9 +368,6 @@ public:
         , angle(0), angleDev(0), velocity(0), velocityDev(0)
         , addParticleTime(0), addParticleCount(0), lastAdvTime(0), stream(false), streamDelay(0)
         , emitting(true), motion(0), clock(this)
-#if defined(QFX_RENDER_OPENGL)
-        , texDirty(true)
-#endif
     {
     }
 
@@ -418,10 +408,6 @@ public:
     QList<QFxParticle> particles;
     QTickAnimationProxy<QFxParticlesPrivate, &QFxParticlesPrivate::tick> clock;
 
-#if defined(QFX_RENDER_OPENGL)
-    bool texDirty;
-    GLTexture tex;
-#endif
 };
 
 //TODO: Stop the clock if no visible particles and not emitting (restart on emittingChanged)
@@ -654,10 +640,6 @@ void QFxParticles::imageLoaded()
 {
     Q_D(QFxParticles);
     d->image = QFxPixmap(d->url);
-#if defined(QFX_RENDER_OPENGL)
-    d->texDirty = true;
-    d->tex.clear();
-#endif
     update();
 }
 
@@ -673,10 +655,6 @@ void QFxParticles::setSource(const QUrl &name)
     if (name.isEmpty()) {
         d->url = name;
         d->image = QPixmap();
-#if defined(QFX_RENDER_OPENGL)
-        d->texDirty = true;
-        d->tex.clear();
-#endif
         update();
     } else {
         d->url = name;
@@ -1106,7 +1084,6 @@ void QFxParticlesPainter::updateSize(){
     setY(myY);
 }
 
-#if defined(QFX_RENDER_QPAINTER) 
 void QFxParticles::paintContents(QPainter &p)
 {
     Q_UNUSED(p);
@@ -1129,64 +1106,6 @@ void QFxParticlesPainter::paintContents(QPainter &p)
     }
     update();//Should I need this? (GV does)
 }
-#elif defined(QFX_RENDER_OPENGL2)
-void QFxParticles::paintGLContents(GLPainter &)
-{
-    //painting is done by the ParticlesPainter, so it can have the right size
-}
-
-void QFxParticlesPainter::paintGLContents(GLPainter &p)
-{
-
-    if (d->image.isNull())
-        return;
-
-    updateSize();
-
-    if (d->texDirty && !d->image.isNull()) {
-        d->tex.setImage(d->image.toImage());
-        d->tex.setHorizontalWrap(GLTexture::Repeat);
-        d->tex.setVerticalWrap(GLTexture::Repeat);
-    }
-    d->texDirty = false;
-
-    SingleTextureOpacityShader *shader = basicShaders()->singleTextureOpacity();
-    shader->enable();
-    shader->setTransform(p.activeTransform);
-
-    glBindTexture(GL_TEXTURE_2D, d->tex.texture());
-
-    const int myX = (int)(x() + parent()->x());
-    const int myY = (int)(y() + parent()->y());
-    float widthV = d->image.width();
-    float heightV = d->image.height();
-    for (int i = 0; i < d->particles.count(); ++i) {
-        const QFxParticle &particle = d->particles.at(i);
-        float left = particle.x - myX;
-        float right = particle.x - myX + widthV;
-        float top = particle.y - myY;
-        float bottom = particle.y - myY + heightV;
-
-        GLfloat vertices[] = { left, bottom,
-            right, bottom,
-            left, top,
-            right, top };
-
-        GLfloat texVertices[] = { 0, 0,
-            1, 0,
-            0, 1,
-            1, 1 };
-
-        shader->setAttributeArray(SingleTextureShader::Vertices, vertices, 2);
-        shader->setAttributeArray(SingleTextureShader::TextureCoords, texVertices, 2);
-        shader->setOpacity(particle.opacity * p.activeOpacity);
-        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-    }
-
-    shader->disableAttributeArray(SingleTextureShader::Vertices);
-    shader->disableAttributeArray(SingleTextureShader::TextureCoords);
-}
-#endif
 
 void QFxParticles::componentComplete()
 {