Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

21 files changed, 3599 insertions, 3924 deletions

diff --git a/examples/gestures/imageviewer/imagewidget.cpp b/examples/gestures/imageviewer/imagewidget.cpp
index 1285e9a..495b73a 100644
--- a/examples/gestures/imageviewer/imagewidget.cpp
+++ b/examples/gestures/imageviewer/imagewidget.cpp
@@ -44,207 +44,97 @@
 #include <QtGui>
 
 ImageWidget::ImageWidget(QWidget *parent)
-    : QWidget(parent)
-{
-    setAttribute(Qt::WA_AcceptTouchEvents);
-    setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_OpaquePaintEvent);
-    setAttribute(Qt::WA_NoSystemBackground);
+    : QWidget(parent),
+    position(0),
+    horizontalOffset(0),
+    verticalOffset(0),
+    rotationAngle(0),
+    scaleFactor(1)
 
+{
     setObjectName("ImageWidget");
-
     setMinimumSize(QSize(100,100));
 
-    position = 0;
-    zoomed = rotated = false;
-
-    zoomedIn = false;
-    horizontalOffset = 0;
-    verticalOffset = 0;
+    setAttribute(Qt::WA_PaintOnScreen);
+    setAttribute(Qt::WA_OpaquePaintEvent);
+    setAttribute(Qt::WA_NoSystemBackground);
 
-    panGesture = new QPanGesture(this);
-    connect(panGesture, SIGNAL(triggered()), this, SLOT(gestureTriggered()));
+    QGesture *panGesture = new QPanGesture(this);
+    connect(panGesture, SIGNAL(started()), this, SLOT(panTriggered()));
+    connect(panGesture, SIGNAL(finished()), this, SLOT(panTriggered()));
+    connect(panGesture, SIGNAL(cancelled()), this, SLOT(panTriggered()));
+    connect(panGesture, SIGNAL(triggered()), this, SLOT(panTriggered()));
 
-    tapAndHoldGesture = new TapAndHoldGesture(this);
-    connect(tapAndHoldGesture, SIGNAL(triggered()), this, SLOT(gestureTriggered()));
-    connect(tapAndHoldGesture, SIGNAL(finished()), this, SLOT(gestureTriggered()));
+    QGesture *pinchGesture = new QPinchGesture(this);
+    connect(pinchGesture, SIGNAL(started()), this, SLOT(pinchTriggered()));
+    connect(pinchGesture, SIGNAL(finished()), this, SLOT(pinchTriggered()));
+    connect(pinchGesture, SIGNAL(cancelled()), this, SLOT(pinchTriggered()));
+    connect(pinchGesture, SIGNAL(triggered()), this, SLOT(pinchTriggered()));
 }
 
 void ImageWidget::paintEvent(QPaintEvent*)
 {
     QPainter p(this);
-    if (currentImage.isNull()) {
-        p.fillRect(geometry(), Qt::white);
-        return;
-    }
-    int hoffset = 0;
-    int voffset = 0;
-    const int w = pixmap.width();
-    const int h = pixmap.height();
-    p.save();
-    if (zoomedIn) {
-        hoffset = horizontalOffset;
-        voffset = verticalOffset;
-        if (horizontalOffset > 0)
-            p.fillRect(0, 0, horizontalOffset, height(), Qt::white);
-        if (verticalOffset > 0)
-            p.fillRect(0, 0, width(), verticalOffset, Qt::white);
-    }
-    p.drawPixmap(hoffset, voffset, pixmap);
-    if (hoffset + w < width())
-        p.fillRect(hoffset + w, 0, width() - w - hoffset, height(), Qt::white);
-    if (voffset + h < height())
-        p.fillRect(0, voffset + h, width(), height() - h - voffset, Qt::white);
-
-    // paint touch feedback
-    if (touchFeedback.tapped || touchFeedback.doubleTapped) {
-        p.setPen(QPen(Qt::gray, 2));
-        p.drawEllipse(touchFeedback.position, 5, 5);
-        if (touchFeedback.doubleTapped) {
-            p.setPen(QPen(Qt::darkGray, 2, Qt::DotLine));
-            p.drawEllipse(touchFeedback.position, 15, 15);
-        } else if (touchFeedback.tapAndHoldState != 0) {
-            QPoint pts[8] = {
-                touchFeedback.position + QPoint(  0, -15),
-                touchFeedback.position + QPoint( 10, -10),
-                touchFeedback.position + QPoint( 15,   0),
-                touchFeedback.position + QPoint( 10,  10),
-                touchFeedback.position + QPoint(  0,  15),
-                touchFeedback.position + QPoint(-10,  10),
-                touchFeedback.position + QPoint(-15,   0)
-            };
-            for (int i = 0; i < touchFeedback.tapAndHoldState/5; ++i)
-                p.drawEllipse(pts[i], 3, 3);
-        }
-    } else if (touchFeedback.sliding) {
-        p.setPen(QPen(Qt::red, 3));
-        QPoint endPos = QPoint(touchFeedback.position.x(), touchFeedback.slidingStartPosition.y());
-        p.drawLine(touchFeedback.slidingStartPosition, endPos);
-        int dx = 10;
-        if (touchFeedback.slidingStartPosition.x() < endPos.x())
-            dx = -1*dx;
-        p.drawLine(endPos, endPos + QPoint(dx, 5));
-        p.drawLine(endPos, endPos + QPoint(dx, -5));
-    }
+    p.fillRect(rect(), Qt::white);
 
-    for (int i = 0; i < TouchFeedback::MaximumNumberOfTouches; ++i) {
-        if (touchFeedback.touches[i].isNull())
-            break;
-        p.drawEllipse(touchFeedback.touches[i], 10, 10);
-    }
-    p.restore();
-}
+    float iw = currentImage.width();
+    float ih = currentImage.height();
+    float wh = height();
+    float ww = width();
 
-void ImageWidget::mousePressEvent(QMouseEvent *event)
-{
-    touchFeedback.tapped = true;
-    touchFeedback.position = event->pos();
+    p.translate(ww/2, wh/2);
+    p.translate(horizontalOffset, verticalOffset);
+    p.rotate(rotationAngle);
+    p.scale(scaleFactor, scaleFactor);
+    p.translate(-iw/2, -ih/2);
+    p.drawImage(0, 0, currentImage);
 }
 
-void ImageWidget::mouseDoubleClickEvent(QMouseEvent *event)
+void ImageWidget::mouseDoubleClickEvent(QMouseEvent *)
 {
-    touchFeedback.doubleTapped = true;
-    const QPoint p = event->pos();
-    touchFeedback.position = p;
-    horizontalOffset = p.x() - currentImage.width()*1.0*p.x()/width();
-    verticalOffset = p.y() - currentImage.height()*1.0*p.y()/height();
-    setZoomedIn(!zoomedIn);
-    zoomed = rotated = false;
-    updateImage();
-
-    feedbackFadeOutTimer.start(500, this);
+    rotationAngle = 0;
+    scaleFactor = 1;
+    verticalOffset = 0;
+    horizontalOffset = 0;
+    update();
 }
 
-void ImageWidget::gestureTriggered()
+void ImageWidget::panTriggered()
 {
-    if (sender() == panGesture) {
-        touchFeedback.tapped = false;
-        touchFeedback.doubleTapped = false;
-        QPanGesture *pg = qobject_cast<QPanGesture*>(sender());
-        if (zoomedIn) {
+    QPanGesture *pg = qobject_cast<QPanGesture*>(sender());
 #ifndef QT_NO_CURSOR
-            switch (pg->state()) {
-                case Qt::GestureStarted:
-                case Qt::GestureUpdated:
-                    setCursor(Qt::SizeAllCursor);
-                    break;
-                default:
-                    setCursor(Qt::ArrowCursor);
-            }
-#endif
-            horizontalOffset += pg->lastOffset().width();
-            verticalOffset += pg->lastOffset().height();
-        } else {
-            // only slide gesture should be accepted
-            if (pg->state() == Qt::GestureFinished) {
-                touchFeedback.sliding = false;
-                zoomed = rotated = false;
-                if (pg->totalOffset().width() > 0)
-                    goNextImage();
-                else
-                    goPrevImage();
-                updateImage();
-            }
-        }
-        update();
-        feedbackFadeOutTimer.start(500, this);
-    } else if (sender() == tapAndHoldGesture) {
-        if (tapAndHoldGesture->state() == Qt::GestureFinished) {
-            qDebug() << "tap and hold detected";
-            touchFeedback.reset();
-            update();
-
-            QMenu menu;
-            menu.addAction("Action 1");
-            menu.addAction("Action 2");
-            menu.addAction("Action 3");
-            menu.exec(mapToGlobal(tapAndHoldGesture->pos()));
-        } else {
-            ++touchFeedback.tapAndHoldState;
-            update();
-        }
-        feedbackFadeOutTimer.start(500, this);
+    switch (pg->state()) {
+        case Qt::GestureStarted:
+        case Qt::GestureUpdated:
+            setCursor(Qt::SizeAllCursor);
+            break;
+        default:
+            setCursor(Qt::ArrowCursor);
     }
+#endif
+    horizontalOffset += pg->lastOffset().width();
+    verticalOffset += pg->lastOffset().height();
+    update();
 }
 
-void ImageWidget::gestureFinished()
+void ImageWidget::pinchTriggered()
 {
-    qDebug() << "gesture finished" << sender();
+    QPinchGesture *pg = qobject_cast<QPinchGesture*>(sender());
+    rotationAngle += pg->rotationAngle();
+    scaleFactor += pg->scaleFactor();
+    update();
 }
 
-void ImageWidget::gestureCancelled()
+void ImageWidget::swipeTriggered()
 {
-    qDebug() << "gesture cancelled" << sender();
+    qDebug() << "swipe!";
+    goNextImage();
+//    goPrevImage();
+    update();
 }
 
 void ImageWidget::resizeEvent(QResizeEvent*)
 {
-    updateImage();
-}
-
-void ImageWidget::updateImage()
-{
-    // should use qtconcurrent here?
-    transformation = QTransform();
-    if (zoomedIn) {
-    } else {
-        if (currentImage.isNull())
-            return;
-        if (zoomed) {
-            transformation = transformation.scale(zoom, zoom);
-        } else {
-            double xscale = (double)width()/currentImage.width();
-            double yscale = (double)height()/currentImage.height();
-            if (xscale < yscale)
-                yscale = xscale;
-            else
-                xscale = yscale;
-            transformation = transformation.scale(xscale, yscale);
-        }
-        if (rotated)
-            transformation = transformation.rotate(angle);
-    }
-    pixmap = QPixmap::fromImage(currentImage).transformed(transformation);
     update();
 }
 
@@ -258,7 +148,7 @@ void ImageWidget::openDirectory(const QString &path)
 
     position = 0;
     goToImage(0);
-    updateImage();
+    update();
 }
 
 QImage ImageWidget::loadImage(const QString &fileName)
@@ -268,6 +158,7 @@ QImage ImageWidget::loadImage(const QString &fileName)
         qDebug() << fileName << ": can't load image";
         return QImage();
     }
+
     QImage image;
     if (!reader.read(&image)) {
         qDebug() << fileName << ": corrupted image";
@@ -276,15 +167,11 @@ QImage ImageWidget::loadImage(const QString &fileName)
     return image;
 }
 
-void ImageWidget::setZoomedIn(bool zoomed)
-{
-    zoomedIn = zoomed;
-}
-
 void ImageWidget::goNextImage()
 {
     if (files.isEmpty())
         return;
+
     if (position < files.size()-1) {
         ++position;
         prevImage = currentImage;
@@ -294,14 +181,14 @@ void ImageWidget::goNextImage()
         else
             nextImage = QImage();
     }
-    setZoomedIn(false);
-    updateImage();
+    update();
 }
 
 void ImageWidget::goPrevImage()
 {
     if (files.isEmpty())
         return;
+
     if (position > 0) {
         --position;
         nextImage = currentImage;
@@ -311,28 +198,31 @@ void ImageWidget::goPrevImage()
         else
             prevImage = QImage();
     }
-    setZoomedIn(false);
-    updateImage();
+    update();
 }
 
 void ImageWidget::goToImage(int index)
 {
     if (files.isEmpty())
         return;
+
     if (index < 0 || index >= files.size()) {
         qDebug() << "goToImage: invalid index: " << index;
         return;
     }
+
     if (index == position+1) {
         goNextImage();
         return;
     }
+
     if (position > 0 && index == position-1) {
         goPrevImage();
         return;
     }
+
     position = index;
-    pixmap = QPixmap();
+
     if (index > 0)
         prevImage = loadImage(path+QLatin1String("/")+files.at(position-1));
     else
@@ -342,18 +232,6 @@ void ImageWidget::goToImage(int index)
         nextImage = loadImage(path+QLatin1String("/")+files.at(position+1));
     else
         nextImage = QImage();
-    setZoomedIn(false);
-    updateImage();
-}
-
-void ImageWidget::timerEvent(QTimerEvent *event)
-{
-    if (event->timerId() == touchFeedback.tapTimer.timerId()) {
-        touchFeedback.tapTimer.stop();
-    } else if (event->timerId() == feedbackFadeOutTimer.timerId()) {
-        feedbackFadeOutTimer.stop();
-        touchFeedback.reset();
-    }
     update();
 }
 
diff --git a/examples/gestures/imageviewer/imagewidget.h b/examples/gestures/imageviewer/imagewidget.h
index 588e59b..b20d8ad 100644
--- a/examples/gestures/imageviewer/imagewidget.h
+++ b/examples/gestures/imageviewer/imagewidget.h
@@ -44,12 +44,8 @@
 
 #include <QWidget>
 #include <QImage>
-#include <QPixmap>
-
 #include <QtGui>
 
-#include "tapandholdgesture.h"
-
 class ImageWidget : public QWidget
 {
     Q_OBJECT
@@ -62,74 +58,32 @@ public:
 protected:
     void paintEvent(QPaintEvent*);
     void resizeEvent(QResizeEvent*);
-    void timerEvent(QTimerEvent*);
-    void mousePressEvent(QMouseEvent*);
     void mouseDoubleClickEvent(QMouseEvent*);
 
 private slots:
-    void gestureTriggered();
-    void gestureFinished();
-    void gestureCancelled();
+    void panTriggered();
+    void pinchTriggered();
+    void swipeTriggered();
 
 private:
     void updateImage();
     QImage loadImage(const QString &fileName);
     void loadImage();
-    void setZoomedIn(bool zoomed);
     void goNextImage();
     void goPrevImage();
     void goToImage(int index);
 
-    QPanGesture *panGesture;
-    TapAndHoldGesture *tapAndHoldGesture;
-
     QString path;
     QStringList files;
     int position;
 
     QImage prevImage, nextImage;
     QImage currentImage;
-    QPixmap pixmap;
-    QTransform transformation;
-
-    bool zoomedIn;
-    int horizontalOffset;
-    int verticalOffset;
-
-    bool zoomed;
-    qreal zoom;
-    bool rotated;
-    qreal angle;
-
-    struct TouchFeedback
-    {
-        bool tapped;
-        QPoint position;
-        bool sliding;
-        QPoint slidingStartPosition;
-        QBasicTimer tapTimer;
-        int tapState;
-        bool doubleTapped;
-        int tapAndHoldState;
-
-        enum { MaximumNumberOfTouches = 5 };
-        QPoint touches[MaximumNumberOfTouches];
 
-        inline TouchFeedback() { reset(); }
-        inline void reset()
-        {
-            tapped = false;
-            sliding = false;
-            tapTimer.stop();
-            tapState = 0;
-            doubleTapped = false;
-            tapAndHoldState = 0;
-            for (int i = 0; i < MaximumNumberOfTouches; ++i) {
-                touches[i] = QPoint();
-            }
-        }
-    } touchFeedback;
-    QBasicTimer feedbackFadeOutTimer;
+    float horizontalOffset;
+    float verticalOffset;
+    float rotationAngle;
+    float scaleFactor;
 };
 
 #endif
diff --git a/examples/gestures/imageviewer/tapandholdgesture.cpp b/examples/gestures/imageviewer/tapandholdgesture.cpp
index 27458ce..fffe10f 100644
--- a/examples/gestures/imageviewer/tapandholdgesture.cpp
+++ b/examples/gestures/imageviewer/tapandholdgesture.cpp
@@ -72,8 +72,6 @@ TapAndHoldGesture::TapAndHoldGesture(QWidget *parent)
 /*! \internal */
 bool TapAndHoldGesture::filterEvent(QEvent *event)
 {
-    if (!event->spontaneous())
-        return false;
     const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
     switch (event->type()) {
     case QEvent::TouchBegin: {
diff --git a/examples/graphicsview/anchorlayout/main.cpp b/examples/graphicsview/anchorlayout/main.cpp
index 7fb04be..ce6e937 100644
--- a/examples/graphicsview/anchorlayout/main.cpp
+++ b/examples/graphicsview/anchorlayout/main.cpp
@@ -66,17 +66,17 @@ int main(int argc, char **argv)
     QGraphicsScene scene;
     scene.setSceneRect(0, 0, 800, 480);
 
-    QSizeF min(30, 100);
-    QSizeF pref(210, 100);
-    QSizeF max(300, 100);
-
-    QGraphicsProxyWidget *a = createItem(min, pref, max, "A");
-    QGraphicsProxyWidget *b = createItem(min, pref, max, "B");
-    QGraphicsProxyWidget *c = createItem(min, pref, max, "C");
-    QGraphicsProxyWidget *d = createItem(min, pref, max, "D");
-    QGraphicsProxyWidget *e = createItem(min, pref, max, "E");
-    QGraphicsProxyWidget *f = createItem(QSizeF(30, 50), QSizeF(150, 50), max, "F");
-    QGraphicsProxyWidget *g = createItem(QSizeF(30, 50), QSizeF(30, 100), max, "G");
+    QSizeF minSize(30, 100);
+    QSizeF prefSize(210, 100);
+    QSizeF maxSize(300, 100);
+
+    QGraphicsProxyWidget *a = createItem(minSize, prefSize, maxSize, "A");
+    QGraphicsProxyWidget *b = createItem(minSize, prefSize, maxSize, "B");
+    QGraphicsProxyWidget *c = createItem(minSize, prefSize, maxSize, "C");
+    QGraphicsProxyWidget *d = createItem(minSize, prefSize, maxSize, "D");
+    QGraphicsProxyWidget *e = createItem(minSize, prefSize, maxSize, "E");
+    QGraphicsProxyWidget *f = createItem(QSizeF(30, 50), QSizeF(150, 50), maxSize, "F");
+    QGraphicsProxyWidget *g = createItem(QSizeF(30, 50), QSizeF(30, 100), maxSize, "G");
 
     QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
 
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp
index 35d65d0..49862d2 100644
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -92,8 +92,6 @@
 #include "qanimationgroup.h"
 #include "qpropertyanimation_p.h"
 
-#include <QtCore/qmath.h>
-#include <QtCore/qmutex.h>
 #include <private/qmutexpool_p.h>
 
 #ifndef QT_NO_ANIMATION
@@ -102,50 +100,38 @@ QT_BEGIN_NAMESPACE
 
 void QPropertyAnimationPrivate::updateMetaProperty()
 {
-    if (!target || propertyName.isEmpty())
+    if (!target || propertyName.isEmpty()) {
+        propertyType = QVariant::Invalid;
+        propertyIndex = -1;
         return;
-
-    if (!hasMetaProperty && !property.isValid()) {
-        const QMetaObject *mo = target->metaObject();
-        propertyIndex = mo->indexOfProperty(propertyName);
-        if (propertyIndex != -1) {
-            hasMetaProperty = true;
-            property = mo->property(propertyIndex);
-            propertyType = property.userType();
-        } else {
-            if (!target->dynamicPropertyNames().contains(propertyName))
-                qWarning("QPropertyAnimation: you're trying to animate a non-existing property %s of your QObject", propertyName.constData());
-        }
     }
 
-    if (property.isValid())
+    propertyType = targetValue->property(propertyName).userType();
+    propertyIndex = targetValue->metaObject()->indexOfProperty(propertyName);
+    if (propertyIndex == -1 && !targetValue->dynamicPropertyNames().contains(propertyName))
+        qWarning("QPropertyAnimation: you're trying to animate a non-existing property %s of your QObject", propertyName.constData());
+
+    if (propertyType != QVariant::Invalid)
         convertValues(propertyType);
 }
 
 void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue)
 {
-    if (!target || state == QAbstractAnimation::Stopped)
+    if (state == QAbstractAnimation::Stopped)
         return;
 
-    if (hasMetaProperty) {
-        if (newValue.userType() == propertyType) {
-          //no conversion is needed, we directly call the QObject::qt_metacall
-          void *data = const_cast<void*>(newValue.constData());
-          target->qt_metacall(QMetaObject::WriteProperty, propertyIndex, &data);
-        } else {
-          property.write(target, newValue);
-        }
-    } else {
-        target->setProperty(propertyName.constData(), newValue);
+    if (!target) {
+        q_func()->stop(); //the target was destroyed we need to stop the animation
+        return;
     }
-}
 
-void QPropertyAnimationPrivate::_q_targetDestroyed()
-{
-    Q_Q(QPropertyAnimation);
-    //we stop here so that this animation is removed from the global hash
-    q->stop();
-    target = 0;
+    if (propertyIndex != -1 && newValue.userType() == propertyType) {
+        //no conversion is needed, we directly call the QObject::qt_metacall
+        void *data = const_cast<void*>(newValue.constData());
+        targetValue->qt_metacall(QMetaObject::WriteProperty, propertyIndex, &data);
+    } else {
+        targetValue->setProperty(propertyName.constData(), newValue);
+    }
 }
 
 /*!
@@ -187,14 +173,13 @@ QPropertyAnimation::~QPropertyAnimation()
  */
 QObject *QPropertyAnimation::targetObject() const
 {
-    Q_D(const QPropertyAnimation);
-    return d->target;
+    return d_func()->target.data();
 }
 
 void QPropertyAnimation::setTargetObject(QObject *target)
 {
     Q_D(QPropertyAnimation);
-    if (d->target == target)
+    if (d->targetValue == target)
         return;
 
     if (d->state != QAbstractAnimation::Stopped) {
@@ -202,15 +187,7 @@ void QPropertyAnimation::setTargetObject(QObject *target)
         return;
     }
 
-    //we need to get notified when the target is destroyed
-    if (d->target)
-        disconnect(d->target, SIGNAL(destroyed()), this, SLOT(_q_targetDestroyed()));
-
-    if (target)
-        connect(target, SIGNAL(destroyed()), SLOT(_q_targetDestroyed()));
-
-    d->target = target;
-    d->hasMetaProperty = false;
+    d->target = d->targetValue = target;
     d->updateMetaProperty();
 }
 
@@ -236,7 +213,6 @@ void QPropertyAnimation::setPropertyName(const QByteArray &propertyName)
     }
 
     d->propertyName = propertyName;
-    d->hasMetaProperty = false;
     d->updateMetaProperty();
 }
 
@@ -273,7 +249,7 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State oldState,
 {
     Q_D(QPropertyAnimation);
 
-    if (!d->target) {
+    if (!d->target && oldState == Stopped) {
         qWarning("QPropertyAnimation::updateState: Changing state of an animation without target");
         return;
     }
@@ -286,14 +262,16 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State oldState,
         typedef QPair<QObject *, QByteArray> QPropertyAnimationPair;
         typedef QHash<QPropertyAnimationPair, QPropertyAnimation*> QPropertyAnimationHash;
         static QPropertyAnimationHash hash;
-        QPropertyAnimationPair key(d->target, d->propertyName);
+        //here we need to use value because we need to know to which pointer
+        //the animation was referring in case stopped because the target was destroyed
+        QPropertyAnimationPair key(d->targetValue, d->propertyName);
         if (newState == Running) {
             d->updateMetaProperty();
             animToStop = hash.value(key, 0);
             hash.insert(key, this);
             // update the default start value
             if (oldState == Stopped) {
-                d->setDefaultStartEndValue(d->target->property(d->propertyName.constData()));
+                d->setDefaultStartEndValue(d->targetValue->property(d->propertyName.constData()));
                 //let's check if we have a start value and an end value
                 if (d->direction == Forward && !startValue().isValid() && !d->defaultStartEndValue.isValid())
                     qWarning("QPropertyAnimation::updateState: starting an animation without start value");
diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h
index e12508d..56fb4b1 100644
--- a/src/corelib/animation/qpropertyanimation.h
+++ b/src/corelib/animation/qpropertyanimation.h
@@ -76,7 +76,6 @@ protected:
     void updateState(QAbstractAnimation::State oldState, QAbstractAnimation::State newState);
 
 private:
-    Q_PRIVATE_SLOT(d_func(), void _q_targetDestroyed())
     Q_DISABLE_COPY(QPropertyAnimation)
     Q_DECLARE_PRIVATE(QPropertyAnimation)
 };
diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h
index ffa6114..3777aa0 100644
--- a/src/corelib/animation/qpropertyanimation_p.h
+++ b/src/corelib/animation/qpropertyanimation_p.h
@@ -54,7 +54,6 @@
 //
 
 #include "qpropertyanimation.h"
-#include <QtCore/qmetaobject.h>
 
 #include "private/qvariantanimation_p.h"
 
@@ -67,20 +66,18 @@ class QPropertyAnimationPrivate : public QVariantAnimationPrivate
    Q_DECLARE_PUBLIC(QPropertyAnimation)
 public:
     QPropertyAnimationPrivate()
-        : target(0), propertyType(0), propertyIndex(0), hasMetaProperty(false)
+        : targetValue(0), propertyType(0), propertyIndex(-1)
     {
     }
 
-    void _q_targetDestroyed();
-
-    QObject *target;
+    QWeakPointer<QObject> target;
+    //we use targetValue to be able to unregister the target from the global hash
+    QObject *targetValue;
 
     //for the QProperty
-    QMetaProperty property;
     int propertyType;
     int propertyIndex;
 
-    bool hasMetaProperty;
     QByteArray propertyName;
     void updateProperty(const QVariant &);
     void updateMetaProperty();
diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h
index ce625f1..da120df 100644
--- a/src/corelib/animation/qvariantanimation_p.h
+++ b/src/corelib/animation/qvariantanimation_p.h
@@ -78,10 +78,7 @@ public:
 
     void setDefaultStartEndValue(const QVariant &value);
 
-    int duration;
-    QEasingCurve easing;
 
-    QVariantAnimation::KeyValues keyValues;
     QVariant currentValue;
     QVariant defaultStartEndValue;
 
@@ -91,6 +88,9 @@ public:
         QVariantAnimation::KeyValue start, end;
     } currentInterval;
 
+    QEasingCurve easing;
+    int duration;
+    QVariantAnimation::KeyValues keyValues;
     QVariantAnimation::Interpolator interpolator;
 
     void setCurrentValueForProgress(const qreal progress);
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 764304d..f4bf5cc 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1646,7 +1646,8 @@ bool QProcess::waitForBytesWritten(int msecs)
     has been emitted, or until \a msecs milliseconds have passed.
 
     Returns true if the process finished; otherwise returns false (if
-    the operation timed out or if an error occurred).
+    the operation timed out, if an error occurred, or if this QProcess
+    is already finished).
 
     This function can operate without an event loop. It is
     useful when writing non-GUI applications and when performing
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 5ab7ed2..df50e55 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -892,7 +892,7 @@ extern "C" {
     qNGEvent.gestureType = QNativeGestureEvent::Rotate;
     NSPoint p = [[event window] convertBaseToScreen:[event locationInWindow]];
     qNGEvent.position = flipPoint(p).toPoint();
-    qNGEvent.percentage = [event rotation];
+    qNGEvent.percentage = -[event rotation];
     qt_sendSpontaneousEvent(qwidget, &qNGEvent);
 }
 
diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index d798d32..0c4cadf 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -72,6 +72,7 @@ QWidgetPrivate *qt_widget_private(QWidget *widget);
 QPanGesture::QPanGesture(QWidget *gestureTarget, QObject *parent)
     : QGesture(*new QPanGesturePrivate, gestureTarget, parent)
 {
+    setObjectName(QLatin1String("QPanGesture"));
 }
 
 void QPanGesturePrivate::setupGestureTarget(QObject *newGestureTarget)
@@ -80,16 +81,22 @@ void QPanGesturePrivate::setupGestureTarget(QObject *newGestureTarget)
     if (gestureTarget && gestureTarget->isWidgetType()) {
         QWidget *w = static_cast<QWidget*>(gestureTarget.data());
         QApplicationPrivate::instance()->widgetGestures[w].pan = 0;
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN)
         qt_widget_private(w)->winSetupGestures();
+#elif defined(Q_WS_MAC)
+        w->setAttribute(Qt::WA_AcceptTouchEvents, false);
+        w->setAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents, false);
 #endif
     }
 
     if (newGestureTarget && newGestureTarget->isWidgetType()) {
         QWidget *w = static_cast<QWidget*>(newGestureTarget);
         QApplicationPrivate::instance()->widgetGestures[w].pan = q;
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN)
         qt_widget_private(w)->winSetupGestures();
+#elif defined(Q_WS_MAC)
+        w->setAttribute(Qt::WA_AcceptTouchEvents);
+        w->setAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents);
 #endif
     }
     QGesturePrivate::setupGestureTarget(newGestureTarget);
@@ -98,15 +105,13 @@ void QPanGesturePrivate::setupGestureTarget(QObject *newGestureTarget)
 /*! \internal */
 bool QPanGesture::event(QEvent *event)
 {
-#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
+#if defined(QT_MAC_USE_COCOA)
     Q_D(QPanGesture);
     if (event->type() == QEvent::Timer) {
         const QTimerEvent *te = static_cast<QTimerEvent *>(event);
-        if (te->timerId() == d->panFinishedTimer) {
-            killTimer(d->panFinishedTimer);
-            d->panFinishedTimer = 0;
-            d->lastOffset = QSize(0, 0);
-            updateState(Qt::GestureFinished);
+        if (te->timerId() == d->singleTouchPanTimer.timerId()) {
+            d->singleTouchPanTimer.stop();
+            updateState(Qt::GestureStarted);
         }
     }
 #endif
@@ -164,8 +169,10 @@ bool QPanGesture::eventFilter(QObject *receiver, QEvent *event)
 /*! \internal */
 bool QPanGesture::filterEvent(QEvent *event)
 {
+#if defined(Q_WS_WIN)
     Q_D(QPanGesture);
     const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
+
     if (event->type() == QEvent::TouchBegin) {
         QTouchEvent::TouchPoint p = ev->touchPoints().at(0);
         d->lastPosition = p.pos().toPoint();
@@ -197,33 +204,55 @@ bool QPanGesture::filterEvent(QEvent *event)
             }
         }
     }
-#ifdef Q_OS_MAC
-    else if (event->type() == QEvent::Wheel) {
-        // On Mac, there is really no native panning gesture. Instead, a two 
-        // finger pan is delivered as mouse wheel events. Otoh, on Windows, you
-        // either get mouse wheel events or pan events. We have decided to make this
-        // the Qt behaviour as well, meaning that on Mac, wheel
-        // events will be masked away when listening for pan events.
-#ifndef QT_MAC_USE_COCOA
-        // In Carbon we receive neither touch-, nor pan gesture events.
-        // So we create pan gestures by converting wheel events. After all, this
-        // is how things are supposed to work on mac in the first place.
-        const QWheelEvent *wev = static_cast<const QWheelEvent*>(event);
-        int offset = wev->delta() / -120;
-        d->lastOffset = wev->orientation() == Qt::Horizontal ? QSize(offset, 0) : QSize(0, offset);
+#elif defined(QT_MAC_USE_COCOA)
+    // The following implements single touch
+    // panning on Mac:
+    Q_D(QPanGesture);
+    const int panBeginDelay = 300;
+    const int panBeginRadius = 3;
+    const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
 
-        if (state() == Qt::NoGesture) {
-            d->totalOffset = d->lastOffset;
-        } else {
-            d->totalOffset += d->lastOffset;
+    switch (event->type()) {
+    case QEvent::TouchBegin: {
+        if (ev->touchPoints().size() == 1) {
+            d->lastPosition = QCursor::pos();
+            d->singleTouchPanTimer.start(panBeginDelay, this);
         }
-
-        killTimer(d->panFinishedTimer);
-        d->panFinishedTimer = startTimer(200);
-        updateState(Qt::GestureUpdated);
-#endif
-        return true;
+        break;}
+    case QEvent::TouchEnd: {
+        if (state() != Qt::NoGesture)
+            updateState(Qt::GestureFinished);
+        reset();
+        break;}
+    case QEvent::TouchUpdate: {
+        if (ev->touchPoints().size() == 1) {
+            if (state() == Qt::NoGesture) {
+                // INVARIANT: The singleTouchTimer has still not fired.
+                // Lets check if the user moved his finger so much from
+                // the starting point that it makes sense to cancel:
+                const QPointF startPos = ev->touchPoints().at(0).startPos().toPoint();
+                const QPointF p = ev->touchPoints().at(0).pos().toPoint();
+                if ((startPos - p).manhattanLength() > panBeginRadius)
+                    reset();
+                else
+                    d->lastPosition = QCursor::pos();
+            } else {
+                QPointF mousePos = QCursor::pos();
+                QPointF dist = mousePos - d->lastPosition;
+                d->lastPosition = mousePos;
+                d->lastOffset = QSizeF(dist.x(), dist.y());
+                d->totalOffset += d->lastOffset;
+                updateState(Qt::GestureUpdated);
+            }
+        } else if (state() == Qt::NoGesture) {
+            reset();
+        }
+        break;}
+    default:
+        return false;
     }
+#else
+    Q_UNUSED(event);
 #endif
     return false;
 }
@@ -232,14 +261,14 @@ bool QPanGesture::filterEvent(QEvent *event)
 void QPanGesture::reset()
 {
     Q_D(QPanGesture);
-    d->lastOffset = d->totalOffset = QSize();
-    d->lastPosition = QPoint();
-#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
-    if (d->panFinishedTimer) {
-        killTimer(d->panFinishedTimer);
-        d->panFinishedTimer = 0;
-    }
+    d->lastOffset = d->totalOffset = QSize(0, 0);
+    d->lastPosition = QPoint(0, 0);
+
+#if defined(QT_MAC_USE_COCOA)
+    d->singleTouchPanTimer.stop();
+    d->prevMousePos = QPointF(0, 0);
 #endif
+
     QGesture::reset();
 }
 
@@ -248,7 +277,7 @@ void QPanGesture::reset()
 
     Specifies a total pan offset since the start of the gesture.
 */
-QSize QPanGesture::totalOffset() const
+QSizeF QPanGesture::totalOffset() const
 {
     Q_D(const QPanGesture);
     return d->totalOffset;
@@ -260,7 +289,7 @@ QSize QPanGesture::totalOffset() const
     Specifies a pan offset since the last time the gesture was
     triggered.
 */
-QSize QPanGesture::lastOffset() const
+QSizeF QPanGesture::lastOffset() const
 {
     Q_D(const QPanGesture);
     return d->lastOffset;
@@ -338,12 +367,13 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
             d->state = Qt::NoGesture;
             d->scaleFactor = d->lastScaleFactor = 1;
             d->rotationAngle = d->lastRotationAngle = 0;
-            d->startCenterPoint = d->centerPoint = d->lastCenterPoint = QPoint();
+            d->startCenterPoint = d->centerPoint = d->lastCenterPoint = QPointF();
 #if defined(Q_WS_WIN)
             d->initialDistance = 0;
 #endif
             return false;
         case QNativeGestureEvent::Rotate:
+            d->scaleFactor = 0;
             d->lastRotationAngle = d->rotationAngle;
 #if defined(Q_WS_WIN)
             d->rotationAngle = -1 * GID_ROTATE_ANGLE_FROM_ARGUMENT(ev->argument);
@@ -354,6 +384,7 @@ bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event)
             event->accept();
             break;
         case QNativeGestureEvent::Zoom:
+            d->rotationAngle = 0;
 #if defined(Q_WS_WIN)
             if (d->initialDistance != 0) {
                 d->lastScaleFactor = d->scaleFactor;
@@ -402,7 +433,7 @@ void QPinchGesture::reset()
     Q_D(QPinchGesture);
     d->scaleFactor = d->lastScaleFactor = 0;
     d->rotationAngle = d->lastRotationAngle = 0;
-    d->startCenterPoint = d->centerPoint = d->lastCenterPoint = QPoint();
+    d->startCenterPoint = d->centerPoint = d->lastCenterPoint = QPointF();
     QGesture::reset();
 }
 
@@ -452,7 +483,7 @@ qreal QPinchGesture::lastRotationAngle() const
     Specifies a center point of the gesture. The point can be used as a center
     point that the object is rotated around.
 */
-QPoint QPinchGesture::centerPoint() const
+QPointF QPinchGesture::centerPoint() const
 {
     return d_func()->centerPoint;
 }
@@ -462,7 +493,7 @@ QPoint QPinchGesture::centerPoint() const
 
     Specifies a previous center point of the gesture.
 */
-QPoint QPinchGesture::lastCenterPoint() const
+QPointF QPinchGesture::lastCenterPoint() const
 {
     return d_func()->lastCenterPoint;
 }
@@ -474,7 +505,7 @@ QPoint QPinchGesture::lastCenterPoint() const
     startCenterPoint and the centerPoint is the distance at which pinching
     fingers has shifted.
 */
-QPoint QPinchGesture::startCenterPoint() const
+QPointF QPinchGesture::startCenterPoint() const
 {
     return d_func()->startCenterPoint;
 }
diff --git a/src/gui/kernel/qstandardgestures.h b/src/gui/kernel/qstandardgestures.h
index 0eb9d92..9f2f204 100644
--- a/src/gui/kernel/qstandardgestures.h
+++ b/src/gui/kernel/qstandardgestures.h
@@ -59,16 +59,16 @@ class Q_GUI_EXPORT QPanGesture : public QGesture
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPanGesture)
 
-    Q_PROPERTY(QSize totalOffset READ totalOffset)
-    Q_PROPERTY(QSize lastOffset READ lastOffset)
+    Q_PROPERTY(QSizeF totalOffset READ totalOffset)
+    Q_PROPERTY(QSizeF lastOffset READ lastOffset)
 
 public:
     QPanGesture(QWidget *gestureTarget, QObject *parent = 0);
 
     bool filterEvent(QEvent *event);
 
-    QSize totalOffset() const;
-    QSize lastOffset() const;
+    QSizeF totalOffset() const;
+    QSizeF lastOffset() const;
 
 protected:
     void reset();
@@ -92,9 +92,9 @@ class Q_GUI_EXPORT QPinchGesture : public QGesture
     Q_PROPERTY(qreal rotationAngle READ rotationAngle)
     Q_PROPERTY(qreal lastRotationAngle READ lastRotationAngle)
 
-    Q_PROPERTY(QPoint startCenterPoint READ startCenterPoint)
-    Q_PROPERTY(QPoint lastCenterPoint READ lastCenterPoint)
-    Q_PROPERTY(QPoint centerPoint READ centerPoint)
+    Q_PROPERTY(QPointF startCenterPoint READ startCenterPoint)
+    Q_PROPERTY(QPointF lastCenterPoint READ lastCenterPoint)
+    Q_PROPERTY(QPointF centerPoint READ centerPoint)
 
 public:
     QPinchGesture(QWidget *gestureTarget, QObject *parent = 0);
@@ -102,9 +102,9 @@ public:
     bool filterEvent(QEvent *event);
     void reset();
 
-    QPoint startCenterPoint() const;
-    QPoint lastCenterPoint() const;
-    QPoint centerPoint() const;
+    QPointF startCenterPoint() const;
+    QPointF lastCenterPoint() const;
+    QPointF centerPoint() const;
 
     qreal scaleFactor() const;
     qreal lastScaleFactor() const;
diff --git a/src/gui/kernel/qstandardgestures_p.h b/src/gui/kernel/qstandardgestures_p.h
index 5fbcc5d..0a4debe 100644
--- a/src/gui/kernel/qstandardgestures_p.h
+++ b/src/gui/kernel/qstandardgestures_p.h
@@ -61,6 +61,7 @@
 #include "qgesture_p.h"
 
 #include "qstandardgestures.h"
+#include "qbasictimer.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -69,21 +70,15 @@ class QPanGesturePrivate : public QGesturePrivate
     Q_DECLARE_PUBLIC(QPanGesture)
 
 public:
-    QPanGesturePrivate()
-    {
-#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
-        panFinishedTimer = 0;
-#endif
-    }
-
     void setupGestureTarget(QObject *o);
 
-    QSize totalOffset;
-    QSize lastOffset;
-    QPoint lastPosition;
+    QSizeF totalOffset;
+    QSizeF lastOffset;
+    QPointF lastPosition;
 
-#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA)
-    int panFinishedTimer;
+#if defined(QT_MAC_USE_COCOA)
+    QBasicTimer singleTouchPanTimer;
+    QPointF prevMousePos;
 #endif
 };
 
@@ -107,9 +102,9 @@ public:
     qreal lastScaleFactor;
     qreal rotationAngle;
     qreal lastRotationAngle;
-    QPoint startCenterPoint;
-    QPoint lastCenterPoint;
-    QPoint centerPoint;
+    QPointF startCenterPoint;
+    QPointF lastCenterPoint;
+    QPointF centerPoint;
 #ifdef Q_WS_WIN
     int initialDistance;
 #endif
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 53d1b6e..192ae6b 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -1064,7 +1064,7 @@ OSStatus QWidgetPrivate::qt_window_event(EventHandlerCallRef er, EventRef event,
                     break;
                 }
                 qNGEvent.gestureType = QNativeGestureEvent::Rotate;
-                qNGEvent.percentage = float(amount);
+                qNGEvent.percentage = float(-amount);
                 break; }
             case kEventGestureSwipe: {
                 HIPoint swipeDirection;
diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
index cd3cf57..c8e85ab 100644
--- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h
@@ -255,7 +255,6 @@ static const char* const qglslPositionWithTextureBrushVertexShader = "\
             gl_Position.xy = gl_Position.xy * invertedHTexCoordsZ; \
             gl_Position.w = invertedHTexCoordsZ; \
             brushTextureCoords.xy = (hTexCoords.xy * invertedTextureSize) * gl_Position.w; \
-            brushTextureCoords.y = -brushTextureCoords.y; \
     }";
 
 static const char* const qglslAffinePositionWithTextureBrushVertexShader
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index ade67d3..ac41ab0 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -4351,13 +4351,6 @@ void QOpenGLPaintEngine::drawTiledPixmap(const QRectF &r, const QPixmap &pm, con
         GLdouble tc_w = r.width()/pm.width();
         GLdouble tc_h = r.height()/pm.height();
 
-        // Rotate the texture so that it is aligned correctly and the
-        // wrapping is done correctly
-        glMatrixMode(GL_TEXTURE);
-        glPushMatrix();
-        glRotatef(180.0, 0.0, 1.0, 0.0);
-        glRotatef(180.0, 0.0, 0.0, 1.0);
-
         q_vertexType vertexArray[4*2];
         q_vertexType texCoordArray[4*2];
 
@@ -4376,7 +4369,6 @@ void QOpenGLPaintEngine::drawTiledPixmap(const QRectF &r, const QPixmap &pm, con
         glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
         glDisableClientState(GL_VERTEX_ARRAY);
-        glPopMatrix();
 
         glDisable(GL_TEXTURE_2D);
 #ifndef QT_OPENGL_ES
diff --git a/src/opengl/util/fragmentprograms_p.h b/src/opengl/util/fragmentprograms_p.h
index 9451eda..6decaca 100644
--- a/src/opengl/util/fragmentprograms_p.h
+++ b/src/opengl/util/fragmentprograms_p.h
@@ -1,57 +1,6 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtOpenGL module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
 #ifndef FRAGMENTPROGRAMS_H
 #define FRAGMENTPROGRAMS_H
 
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
 enum FragmentVariable {
     VAR_BRUSH_TEXTURE,
     VAR_LINEAR,
@@ -71,7 +20,7 @@ enum FragmentVariable {
     VAR_FMP2_M_RADIUS2,
     VAR_FMP,
     VAR_INV_MATRIX_M0,
-    VAR_ANGLE
+    VAR_ANGLE,
 };
 
 enum FragmentBrushType {
@@ -80,7 +29,7 @@ enum FragmentBrushType {
     FRAGMENT_PROGRAM_BRUSH_CONICAL,
     FRAGMENT_PROGRAM_BRUSH_LINEAR,
     FRAGMENT_PROGRAM_BRUSH_TEXTURE,
-    FRAGMENT_PROGRAM_BRUSH_PATTERN
+    FRAGMENT_PROGRAM_BRUSH_PATTERN,
 };
 
 enum FragmentCompositionModeType {
@@ -109,12 +58,12 @@ enum FragmentCompositionModeType {
     COMPOSITION_MODES_DIFFERENCE_NOMASK,
     COMPOSITION_MODES_EXCLUSION_NOMASK,
     COMPOSITION_MODE_BLEND_MODE_MASK,
-    COMPOSITION_MODE_BLEND_MODE_NOMASK
+    COMPOSITION_MODE_BLEND_MODE_NOMASK,
 };
 
 enum FragmentMaskType {
     FRAGMENT_PROGRAM_MASK_TRAPEZOID_AA,
-    FRAGMENT_PROGRAM_MASK_ELLIPSE_AA
+    FRAGMENT_PROGRAM_MASK_ELLIPSE_AA,
 };
 
 static const unsigned int num_fragment_variables = 19;
@@ -133,55 +82,55 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_MASK_TRAPEZOID_AA =
     "TEMP R4;\n"
     "ADD R4.x, fragment.position, c[0];\n"
     "ADD R0.y, fragment.position, -c[0].x;\n"
-    "MAX R2.x, R0.y, fragment.texcoord[0].y;\n"
+    "MAX R3.w, fragment.texcoord[0].y, R0.y;\n"
     "ADD R0.x, fragment.position.y, c[0];\n"
-    "MIN R2.y, R0.x, fragment.texcoord[0].x;\n"
-    "ADD R3.x, fragment.position, -c[0];\n"
+    "MIN R3.z, R0.x, fragment.texcoord[0].x;\n"
+    "ADD R2.z, fragment.position.x, -c[0].x;\n"
+    "MOV R0.yw, R3.w;\n"
+    "MOV R0.xz, R3.z;\n"
+    "MAD R1, fragment.texcoord[1].xxzz, R0, fragment.texcoord[1].yyww;\n"
+    "MAD R1.zw, fragment.position.x, c[0].y, -R1;\n"
+    "MOV R0.z, R1.x;\n"
+    "MOV R0.w, R1.z;\n"
+    "MOV R0.y, R1.w;\n"
+    "MOV R0.x, R1.y;\n"
+    "MIN R2.xy, R0.zwzw, R0;\n"
+    "SGE R1.xy, R0, R0.zwzw;\n"
     "ADD R1.zw, -fragment.texcoord[0], -fragment.texcoord[0];\n"
-    "MOV R3.y, R4.x;\n"
-    "MOV R0.yw, R2.x;\n"
-    "MOV R0.xz, R2.y;\n"
-    "MAD R0, fragment.texcoord[1].xxzz, R0, fragment.texcoord[1].yyww;\n"
-    "MAD R1.xy, fragment.position.x, c[0].y, -R0.zwzw;\n"
-    "MOV R0.w, R1.x;\n"
-    "MOV R1.x, R0.y;\n"
-    "MOV R0.z, R0.x;\n"
-    "SGE R2.zw, R1.xyxy, R0;\n"
-    "MAX R0.xy, R0.zwzw, R1;\n"
-    "MIN R0.zw, R0, R1.xyxy;\n"
-    "MAD R2.zw, R2, R1, fragment.texcoord[0];\n"
-    "ADD R1, R3.xyxy, -R0.zzww;\n"
-    "MAD R1, R1, R2.zzww, R2.x;\n"
-    "ADD R3.zw, R0.xyxy, R0;\n"
-    "ADD R3.y, R2, -R2.x;\n"
-    "ADD R2.zw, R1.xyyw, -R2.x;\n"
-    "ADD R4.zw, R4.x, -R0;\n"
-    "MUL R2.zw, R4, R2;\n"
-    "ADD R4.zw, R1.xyyw, R1.xyxz;\n"
-    "ADD R1.xz, R2.y, -R1;\n"
-    "MAD R2.zw, -R2, c[0].x, R3.y;\n"
-    "MAD R3.zw, R3, c[0].x, -R3.x;\n"
-    "MAD R3.zw, R3, R3.y, -R2;\n"
-    "ADD R1.y, R4.x, -R3.x;\n"
-    "MAD R4.zw, -R4, c[0].x, R2.y;\n"
-    "MUL R4.zw, R4, R1.y;\n"
-    "ADD R1.yw, R0.xxzy, -R3.x;\n"
-    "MUL R1.xy, R1.xzzw, R1.ywzw;\n"
-    "MAD R1.zw, R1.xyxy, c[0].x, -R4;\n"
-    "SGE R1.xy, R4.x, R0;\n"
-    "MUL R1.zw, R1.xyxy, R1;\n"
-    "MAD R1.xy, R1, R3.zwzw, R2.zwzw;\n"
-    "SGE R2.zw, R3.x, R0;\n"
-    "ADD R1.zw, R4, R1;\n"
-    "ADD R1.zw, R1, -R1.xyxy;\n"
-    "MAD R1.xy, R2.zwzw, R1.zwzw, R1;\n"
-    "ADD R1.xy, R1, -R3.y;\n"
-    "SGE R0.zw, R4.x, R0;\n"
-    "MAD R0.zw, R0, R1.xyxy, R3.y;\n"
-    "SGE R0.xy, R0, R3.x;\n"
+    "MAX R0.xy, R0.zwzw, R0;\n"
+    "MAD R3.xy, R1, R1.zwzw, fragment.texcoord[0].zwzw;\n"
+    "MOV R2.w, R4.x;\n"
+    "ADD R1, -R2.xxyy, R2.zwzw;\n"
+    "MAD R1, R1, R3.xxyy, R3.w;\n"
+    "ADD R3.xy, R1.ywzw, R1.xzzw;\n"
+    "ADD R4.zw, R3.z, -R1.xyxz;\n"
+    "ADD R1.zw, -R3.w, R1.xyyw;\n"
+    "ADD R1.xy, R4.x, -R2;\n"
+    "MUL R1.xy, R1, R1.zwzw;\n"
+    "MAD R3.xy, -R3, c[0].x, R3.z;\n"
+    "ADD R2.w, R4.x, -R2.z;\n"
+    "MUL R0.zw, R3.xyxy, R2.w;\n"
+    "ADD R2.w, R3.z, -R3;\n"
+    "ADD R3.xy, -R2.z, R0;\n"
+    "MUL R3.xy, R4.zwzw, R3;\n"
+    "ADD R4.zw, R2.xyxy, R0.xyxy;\n"
+    "MAD R1.zw, R4, c[0].x, -R2.z;\n"
+    "MAD R1.xy, -R1, c[0].x, R2.w;\n"
+    "MAD R4.zw, R2.w, R1, -R1.xyxy;\n"
+    "SGE R1.zw, R4.x, R0.xyxy;\n"
+    "MAD R3.xy, R3, c[0].x, -R0.zwzw;\n"
+    "MAD R1.xy, R1.zwzw, R4.zwzw, R1;\n"
+    "MAD R0.zw, R1, R3.xyxy, R0;\n"
+    "ADD R1.zw, R0, -R1.xyxy;\n"
+    "SGE R0.zw, R2.z, R2.xyxy;\n"
+    "MAD R0.zw, R0, R1, R1.xyxy;\n"
+    "ADD R0.zw, -R2.w, R0;\n"
+    "SGE R1.xy, R4.x, R2;\n"
+    "MAD R0.zw, R1.xyxy, R0, R2.w;\n"
+    "SGE R0.xy, R0, R2.z;\n"
     "MUL R0.xy, R0.zwzw, R0;\n"
-    "ADD R0.x, R3.y, -R0;\n"
-    "SGE R0.z, R2.y, R2.x;\n"
+    "ADD R0.x, R2.w, -R0;\n"
+    "SGE R0.z, R3, R3.w;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "MUL result.color, R0.x, R0.z;\n"
     "END\n"
@@ -195,20 +144,20 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_MASK_ELLIPSE_AA =
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R1.xyz, R0.y, c[2];\n"
-    "MAD R0.xyz, R0.x, c[1], R1;\n"
-    "ADD R0.xyz, R0, c[3];\n"
+    "ADD R0.xy, fragment.position, c[3];\n"
+    "MUL R1.xyz, R0.y, c[1];\n"
+    "MAD R0.xyz, R0.x, c[0], R1;\n"
+    "ADD R0.xyz, R0, c[2];\n"
     "RCP R2.z, R0.z;\n"
-    "MUL R0.zw, R0.xyxy, R2.z;\n"
-    "MUL R2.xy, R0.zwzw, fragment.texcoord[0];\n"
-    "MOV R1.xy, c[1];\n"
-    "MOV R1.zw, c[2].xyxy;\n"
-    "MOV R0.x, c[1].z;\n"
-    "MOV R0.y, c[2].z;\n"
-    "MAD R0, -R0.xyxy, R0.zzww, R1.xzyw;\n"
+    "MUL R1.zw, R0.xyxy, R2.z;\n"
+    "MUL R2.xy, R1.zwzw, fragment.texcoord[0];\n"
+    "MOV R1.x, c[0].z;\n"
+    "MOV R1.y, c[1].z;\n"
+    "MOV R0.xy, c[0];\n"
+    "MOV R0.zw, c[1].xyxy;\n"
+    "MAD R0, R1.zzww, -R1.xyxy, R0.xzyw;\n"
     "MUL R1.xy, R2, fragment.texcoord[0];\n"
-    "MUL R0, R0, R2.z;\n"
+    "MUL R0, R2.z, R0;\n"
     "MUL R1.xy, R1, c[4].x;\n"
     "MUL R1.zw, R1.xyxy, R0.xyxz;\n"
     "MUL R0.xy, R1, R0.ywzw;\n"
@@ -230,36 +179,34 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_MASK_ELLIPSE_AA =
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_SIMPLE_PORTER_DUFF =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 1 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "MUL R0.xy, fragment.position, c[3];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MUL R0.xyz, R1, c[6].y;\n"
-    "MUL R2.xyz, R0, fragment.color.primary.w;\n"
-    "MUL R0.xyz, fragment.color.primary, c[6].x;\n"
-    "MAD R2.xyz, R0, R1.w, R2;\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "ADD R0.w, -R1, c[4].x;\n"
-    "MUL R0.xyz, fragment.color.primary, c[5].y;\n"
-    "MAD R2.xyz, R0, R0.w, R2;\n"
-    "MUL R0.xyz, R1, c[5].z;\n"
-    "ADD R0.w, -fragment.color.primary, c[4].x;\n"
-    "MAD R2.xyz, R0, R0.w, R2;\n"
-    "ADD R0.y, -R1.w, c[4].x;\n"
-    "MUL R0.x, fragment.color.primary.w, R1.w;\n"
-    "MUL R0.y, fragment.color.primary.w, R0;\n"
-    "MUL R0.z, R1.w, R0.w;\n"
-    "DP3 R2.w, R0, c[5];\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1.xyz, R0, c[0].y;\n"
+    "MUL R2.xyz, fragment.color.primary.w, R1;\n"
+    "MUL R1.xyz, fragment.color.primary, c[0].x;\n"
+    "MAD R2.xyz, R0.w, R1, R2;\n"
+    "ADD R3.xy, fragment.position, c[4];\n"
+    "ADD R1.w, -R0, c[6].x;\n"
+    "MUL R1.xyz, fragment.color.primary, c[1].y;\n"
+    "MAD R2.xyz, R1.w, R1, R2;\n"
+    "MUL R1.xyz, R0, c[1].z;\n"
+    "ADD R2.w, -fragment.color.primary, c[6].x;\n"
+    "MAD R2.xyz, R2.w, R1, R2;\n"
+    "MUL R1.z, R0.w, R2.w;\n"
+    "MUL R1.x, fragment.color.primary.w, R0.w;\n"
+    "MUL R1.y, fragment.color.primary.w, R1.w;\n"
+    "DP3 R2.w, R1, c[1];\n"
+    "MUL R3.xy, R3, c[2];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[5];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -270,21 +217,21 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "ADD R0.x, -R1.w, c[4];\n"
-    "MUL R0.xyz, fragment.color.primary, R0.x;\n"
-    "MAD R0.xyz, fragment.color.primary, R1, R0;\n"
-    "ADD R0.w, -fragment.color.primary, c[4].x;\n"
-    "MAD R2.xyz, R1, R0.w, R0;\n"
-    "ADD R0.z, fragment.color.primary.w, R1.w;\n"
-    "MAD R2.w, -fragment.color.primary, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "ADD R1.x, -R0.w, c[4];\n"
+    "MUL R1.xyz, fragment.color.primary, R1.x;\n"
+    "MAD R1.xyz, fragment.color.primary, R0, R1;\n"
+    "ADD R1.w, -fragment.color.primary, c[4].x;\n"
+    "MAD R2.xyz, R0, R1.w, R1;\n"
+    "ADD R1.z, fragment.color.primary.w, R0.w;\n"
+    "MAD R2.w, -fragment.color.primary, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[2];\n"
+    "MUL R1.xy, R1, c[0];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[3];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -294,16 +241,16 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "ADD R2, fragment.color.primary, R1;\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "MAD R2, -fragment.color.primary, R1, R2;\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "ADD R1.xy, fragment.position, c[2];\n"
+    "ADD R2, fragment.color.primary, R0;\n"
+    "MUL R1.xy, R1, c[0];\n"
+    "MAD R2, -fragment.color.primary, R0, R2;\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[3];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -315,7 +262,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
     "TEX R1, R0, texture[0], 2D;\n"
     "ADD R0.w, -R1, c[4].y;\n"
     "MUL R3.xyz, fragment.color.primary, R0.w;\n"
@@ -336,11 +283,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "MAD R2.xyz, R0, R3, R2;\n"
     "ADD R0.z, fragment.color.primary.w, R1.w;\n"
     "MAD R2.w, -fragment.color.primary, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[2];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[3];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -352,23 +299,23 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, fragment.color.primary.w;\n"
-    "MUL R0.xyz, fragment.color.primary, R1.w;\n"
-    "MIN R0.xyz, R0, R2;\n"
-    "ADD R0.w, -R1, c[4].x;\n"
-    "MAD R0.xyz, fragment.color.primary, R0.w, R0;\n"
-    "ADD R0.w, -fragment.color.primary, c[4].x;\n"
-    "MAD R2.xyz, R1, R0.w, R0;\n"
-    "ADD R0.z, fragment.color.primary.w, R1.w;\n"
-    "MAD R2.w, -fragment.color.primary, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R2.xyz, fragment.color.primary.w, R0;\n"
+    "MUL R1.xyz, fragment.color.primary, R0.w;\n"
+    "MIN R1.xyz, R1, R2;\n"
+    "ADD R1.w, -R0, c[4].x;\n"
+    "MAD R1.xyz, fragment.color.primary, R1.w, R1;\n"
+    "ADD R1.w, -fragment.color.primary, c[4].x;\n"
+    "MAD R2.xyz, R0, R1.w, R1;\n"
+    "ADD R1.z, fragment.color.primary.w, R0.w;\n"
+    "MAD R2.w, -fragment.color.primary, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[2];\n"
+    "MUL R1.xy, R1, c[0];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[3];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -379,35 +326,35 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, fragment.color.primary.w;\n"
-    "MUL R0.xyz, fragment.color.primary, R1.w;\n"
-    "MAX R0.xyz, R0, R2;\n"
-    "ADD R0.w, -R1, c[4].x;\n"
-    "MAD R0.xyz, fragment.color.primary, R0.w, R0;\n"
-    "ADD R0.w, -fragment.color.primary, c[4].x;\n"
-    "MAD R2.xyz, R1, R0.w, R0;\n"
-    "ADD R0.z, fragment.color.primary.w, R1.w;\n"
-    "MAD R2.w, -fragment.color.primary, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R2.xyz, fragment.color.primary.w, R0;\n"
+    "MUL R1.xyz, fragment.color.primary, R0.w;\n"
+    "MAX R1.xyz, R1, R2;\n"
+    "ADD R1.w, -R0, c[4].x;\n"
+    "MAD R1.xyz, fragment.color.primary, R1.w, R1;\n"
+    "ADD R1.w, -fragment.color.primary, c[4].x;\n"
+    "MAD R2.xyz, R0, R1.w, R1;\n"
+    "ADD R1.z, fragment.color.primary.w, R0.w;\n"
+    "MAD R2.w, -fragment.color.primary, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[2];\n"
+    "MUL R1.xy, R1, c[0];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[3];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_COLORDODGE =
     "!!ARBfp1.0\n"
     "PARAM c[5] = { program.local[0..3],\n"
-    "		{ 1, 1e-06 } };\n"
+    "		{ 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "ADD R1.y, -fragment.color.primary.w, c[4].x;\n"
     "MAX R1.x, fragment.color.primary.w, c[4].y;\n"
@@ -417,7 +364,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "RCP R1.x, R1.x;\n"
     "MAD R1.xyz, -fragment.color.primary, R1.x, c[4].x;\n"
     "MAX R1.xyz, R1, c[4].y;\n"
-    "MUL R2.xyz, R0, fragment.color.primary.w;\n"
+    "MUL R2.xyz, fragment.color.primary.w, R0;\n"
     "MUL R1.w, fragment.color.primary, R0;\n"
     "RCP R1.x, R1.x;\n"
     "RCP R1.y, R1.y;\n"
@@ -430,11 +377,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "MAD R2.xyz, R2, R3, R1;\n"
     "ADD R1.z, fragment.color.primary.w, R0.w;\n"
     "MAD R2.w, -fragment.color.primary, R0, R1.z;\n"
-    "ADD R1.xy, fragment.position, c[0];\n"
-    "MUL R1.xy, R1, c[1];\n"
+    "ADD R1.xy, fragment.position, c[2];\n"
+    "MUL R1.xy, R1, c[0];\n"
     "TEX R1, R1, texture[1], 2D;\n"
     "ADD R2, R2, -R0;\n"
-    "DP4 R1.x, R1, c[2];\n"
+    "DP4 R1.x, R1, c[3];\n"
     "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
@@ -442,29 +389,28 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_COLORBURN =
     "!!ARBfp1.0\n"
     "PARAM c[5] = { program.local[0..3],\n"
-    "		{ 1, 9.9999997e-06 } };\n"
+    "		{ 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "ADD R1.w, -R0, c[4].x;\n"
-    "MUL R1.xyz, R0, fragment.color.primary.w;\n"
+    "MUL R1.xyz, fragment.color.primary.w, R0;\n"
     "MAD R2.xyz, fragment.color.primary, R0.w, R1;\n"
     "MAD R1.xyz, -fragment.color.primary.w, R0.w, R2;\n"
     "MUL R3.xyz, fragment.color.primary.w, R1;\n"
     "MAX R1.xyz, fragment.color.primary, c[4].y;\n"
+    "ADD R2.w, -fragment.color.primary, c[4].x;\n"
     "MUL R4.xyz, fragment.color.primary, R1.w;\n"
     "RCP R1.x, R1.x;\n"
     "RCP R1.y, R1.y;\n"
     "RCP R1.z, R1.z;\n"
     "MAD R3.xyz, R3, R1, R4;\n"
-    "ADD R2.w, -fragment.color.primary, c[4].x;\n"
     "MUL R1.xyz, R0, R2.w;\n"
     "MAD R1.xyz, fragment.color.primary, R1.w, R1;\n"
-    "ADD R2.w, -fragment.color.primary, c[4].x;\n"
     "MAD R3.xyz, R0, R2.w, R3;\n"
     "MUL R1.w, fragment.color.primary, R0;\n"
     "ADD R3.xyz, R3, -R1;\n"
@@ -472,11 +418,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "MAD R2.xyz, R2, R3, R1;\n"
     "ADD R1.z, fragment.color.primary.w, R0.w;\n"
     "MAD R2.w, -fragment.color.primary, R0, R1.z;\n"
-    "ADD R1.xy, fragment.position, c[0];\n"
-    "MUL R1.xy, R1, c[1];\n"
+    "ADD R1.xy, fragment.position, c[2];\n"
+    "MUL R1.xy, R1, c[0];\n"
     "TEX R1, R1, texture[1], 2D;\n"
     "ADD R2, R2, -R0;\n"
-    "DP4 R1.x, R1, c[2];\n"
+    "DP4 R1.x, R1, c[3];\n"
     "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
@@ -489,7 +435,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
     "TEX R1, R0, texture[0], 2D;\n"
     "ADD R0.w, -R1, c[4].y;\n"
     "MUL R3.xyz, fragment.color.primary, R0.w;\n"
@@ -510,11 +456,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "MAD R2.xyz, R0, R3, R2;\n"
     "ADD R0.z, fragment.color.primary.w, R1.w;\n"
     "MAD R2.w, -fragment.color.primary, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[2];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[3];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -522,58 +468,56 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..3],\n"
-    "		{ 1, 9.9999997e-06, 2, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 9.9999997e-006, 2, 3 },\n"
+    "		{ 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MAX R1.x, R0.w, c[4].y;\n"
     "RCP R1.w, R1.x;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R1.xyz, -R2, c[4].w;\n"
+    "MUL R1.xyz, -R2, c[5].x;\n"
     "RSQ R2.w, R2.x;\n"
-    "ADD R4.xyz, R1, c[5].x;\n"
+    "ADD R4.xyz, R1, c[4].w;\n"
     "MAD R1.xyz, -R0, R1.w, c[4].x;\n"
     "RSQ R2.z, R2.z;\n"
     "RSQ R2.y, R2.y;\n"
     "RCP R2.x, R2.w;\n"
     "RCP R2.z, R2.z;\n"
     "RCP R2.y, R2.y;\n"
-    "MAD R5.xyz, R2, R0.w, -R0;\n"
+    "MAD R5.xyz, R0.w, R2, -R0;\n"
     "MAD R2.xyz, fragment.color.primary, c[4].z, -fragment.color.primary.w;\n"
     "MUL R3.xyz, R1, R2;\n"
     "MAD R3.xyz, -R3, R4, fragment.color.primary.w;\n"
     "MUL R4.xyz, R5, R2;\n"
     "MAD R1.xyz, -R1, R2, fragment.color.primary.w;\n"
-    "MAD R5.xyz, R0, fragment.color.primary.w, R4;\n"
     "MUL R3.xyz, R0, R3;\n"
-    "MUL R4.xyz, R0, c[4].w;\n"
-    "ADD R5.xyz, R5, -R3;\n"
-    "SGE R4.xyz, R4, R0.w;\n"
-    "MUL R4.xyz, R4, R5;\n"
-    "ADD R2.xyz, R3, R4;\n"
+    "MAD R4.xyz, fragment.color.primary.w, R0, R4;\n"
+    "ADD R5.xyz, R4, -R3;\n"
+    "MUL R4.xyz, R0, c[5].x;\n"
+    "SGE R2.xyz, R4, R0.w;\n"
+    "MAD R2.xyz, R2, R5, R3;\n"
     "MUL R1.xyz, R0, R1;\n"
     "MUL R3.xyz, fragment.color.primary, c[4].z;\n"
     "ADD R2.xyz, R2, -R1;\n"
     "SGE R3.xyz, R3, fragment.color.primary.w;\n"
-    "MUL R2.xyz, R3, R2;\n"
-    "ADD R1.xyz, R1, R2;\n"
+    "MAD R1.xyz, R3, R2, R1;\n"
     "ADD R1.w, -R0, c[4].x;\n"
     "MAD R1.xyz, fragment.color.primary, R1.w, R1;\n"
     "ADD R1.w, -fragment.color.primary, c[4].x;\n"
     "MAD R2.xyz, R0, R1.w, R1;\n"
     "ADD R1.z, fragment.color.primary.w, R0.w;\n"
     "MAD R2.w, -fragment.color.primary, R0, R1.z;\n"
-    "ADD R1.xy, fragment.position, c[0];\n"
-    "MUL R1.xy, R1, c[1];\n"
+    "ADD R1.xy, fragment.position, c[2];\n"
+    "MUL R1.xy, R1, c[0];\n"
     "TEX R1, R1, texture[1], 2D;\n"
     "ADD R2, R2, -R0;\n"
-    "DP4 R1.x, R1, c[2];\n"
+    "DP4 R1.x, R1, c[3];\n"
     "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
@@ -586,77 +530,75 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, fragment.color.primary.w;\n"
-    "MUL R0.xyz, fragment.color.primary, R1.w;\n"
-    "MIN R0.xyz, R0, R2;\n"
-    "ADD R3.xyz, fragment.color.primary, R1;\n"
-    "MAD R2.xyz, -R0, c[4].x, R3;\n"
-    "ADD R0.z, fragment.color.primary.w, R1.w;\n"
-    "MAD R2.w, -fragment.color.primary, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "ADD R1.xyz, fragment.color.primary, R0;\n"
+    "MUL R3.xyz, fragment.color.primary.w, R0;\n"
+    "MUL R2.xyz, fragment.color.primary, R0.w;\n"
+    "MIN R2.xyz, R2, R3;\n"
+    "MAD R2.xyz, -R2, c[4].x, R1;\n"
+    "ADD R1.z, fragment.color.primary.w, R0.w;\n"
+    "MAD R2.w, -fragment.color.primary, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[2];\n"
+    "MUL R1.xy, R1, c[0];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[3];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_EXCLUSION =
     "!!ARBfp1.0\n"
     "PARAM c[5] = { program.local[0..3],\n"
-    "		{ 1, 2 } };\n"
+    "		{ 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xy, fragment.position, c[3];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MUL R0.xyz, R1, fragment.color.primary.w;\n"
-    "MAD R2.xyz, fragment.color.primary, R1.w, R0;\n"
-    "MUL R0.xyz, fragment.color.primary, R1;\n"
-    "MAD R0.xyz, -R0, c[4].y, R2;\n"
-    "ADD R0.w, -R1, c[4].x;\n"
-    "MAD R0.xyz, fragment.color.primary, R0.w, R0;\n"
-    "ADD R0.w, -fragment.color.primary, c[4].x;\n"
-    "MAD R2.xyz, R1, R0.w, R0;\n"
-    "ADD R0.z, fragment.color.primary.w, R1.w;\n"
-    "MAD R2.w, -fragment.color.primary, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, fragment.position, c[1];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1.xyz, fragment.color.primary.w, R0;\n"
+    "MAD R2.xyz, fragment.color.primary, R0.w, R1;\n"
+    "MUL R1.xyz, fragment.color.primary, R0;\n"
+    "MAD R1.xyz, -R1, c[4].x, R2;\n"
+    "ADD R1.w, -R0, c[4].y;\n"
+    "MAD R1.xyz, fragment.color.primary, R1.w, R1;\n"
+    "ADD R1.w, -fragment.color.primary, c[4].y;\n"
+    "MAD R2.xyz, R0, R1.w, R1;\n"
+    "ADD R1.z, fragment.color.primary.w, R0.w;\n"
+    "MAD R2.w, -fragment.color.primary, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[2];\n"
+    "MUL R1.xy, R1, c[0];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[3];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_SIMPLE_PORTER_DUFF_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[4] = { program.local[0],\n"
-    "		{ 1 },\n"
-    "		program.local[2..3] };\n"
+    "PARAM c[4] = { program.local[0..2],\n"
+    "		{ 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xy, fragment.position, c[0];\n"
+    "MUL R0.xy, fragment.position, c[2];\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R1.xyz, R0, c[3].y;\n"
-    "MUL R2.xyz, R1, fragment.color.primary.w;\n"
-    "MUL R1.xyz, fragment.color.primary, c[3].x;\n"
-    "MAD R2.xyz, R1, R0.w, R2;\n"
-    "MUL R0.xyz, R0, c[2].z;\n"
-    "ADD R1.w, -R0, c[1].x;\n"
-    "MUL R1.xyz, fragment.color.primary, c[2].y;\n"
-    "MAD R1.xyz, R1, R1.w, R2;\n"
-    "ADD R1.w, -fragment.color.primary, c[1].x;\n"
-    "MAD result.color.xyz, R0, R1.w, R1;\n"
-    "ADD R0.y, -R0.w, c[1].x;\n"
+    "MUL R1.xyz, R0, c[0].y;\n"
+    "MUL R2.xyz, fragment.color.primary.w, R1;\n"
+    "MUL R1.xyz, fragment.color.primary, c[0].x;\n"
+    "MAD R2.xyz, R0.w, R1, R2;\n"
+    "MUL R0.xyz, R0, c[1].z;\n"
+    "ADD R1.w, -R0, c[3].x;\n"
+    "MUL R1.xyz, fragment.color.primary, c[1].y;\n"
+    "MAD R1.xyz, R1.w, R1, R2;\n"
+    "ADD R2.x, -fragment.color.primary.w, c[3];\n"
+    "MAD result.color.xyz, R2.x, R0, R1;\n"
     "MUL R0.x, fragment.color.primary.w, R0.w;\n"
-    "MUL R0.z, R0.w, R1.w;\n"
-    "MUL R0.y, fragment.color.primary.w, R0;\n"
-    "DP3 result.color.w, R0, c[2];\n"
+    "MUL R0.z, R0.w, R2.x;\n"
+    "MUL R0.y, fragment.color.primary.w, R1.w;\n"
+    "DP3 result.color.w, R0, c[1];\n"
     "END\n"
     ;
 
@@ -732,7 +674,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R2;\n"
     "MUL R0.xy, fragment.position, c[0];\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R2.xyz, R0, fragment.color.primary.w;\n"
+    "MUL R2.xyz, fragment.color.primary.w, R0;\n"
     "MUL R1.xyz, fragment.color.primary, R0.w;\n"
     "MIN R1.xyz, R1, R2;\n"
     "ADD R1.w, -R0, c[1].x;\n"
@@ -753,7 +695,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R2;\n"
     "MUL R0.xy, fragment.position, c[0];\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R2.xyz, R0, fragment.color.primary.w;\n"
+    "MUL R2.xyz, fragment.color.primary.w, R0;\n"
     "MUL R1.xyz, fragment.color.primary, R0.w;\n"
     "MAX R1.xyz, R1, R2;\n"
     "ADD R1.w, -R0, c[1].x;\n"
@@ -768,7 +710,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_COLORDODGE_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[2] = { program.local[0],\n"
-    "		{ 1, 1e-06 } };\n"
+    "		{ 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -782,7 +724,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "MAD R1.xyz, fragment.color.primary, R1.w, R1;\n"
     "MAD R2.xyz, -fragment.color.primary, R2.x, c[1].x;\n"
     "MAX R2.xyz, R2, c[1].y;\n"
-    "MUL R0.xyz, R0, fragment.color.primary.w;\n"
+    "MUL R0.xyz, fragment.color.primary.w, R0;\n"
     "MUL R1.w, fragment.color.primary, R0;\n"
     "RCP R2.x, R2.x;\n"
     "RCP R2.y, R2.y;\n"
@@ -801,7 +743,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_COLORBURN_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[2] = { program.local[0],\n"
-    "		{ 1, 9.9999997e-06 } };\n"
+    "		{ 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -809,7 +751,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R4;\n"
     "MUL R0.xy, fragment.position, c[0];\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R1.xyz, R0, fragment.color.primary.w;\n"
+    "MUL R1.xyz, fragment.color.primary.w, R0;\n"
     "MAD R2.xyz, fragment.color.primary, R0.w, R1;\n"
     "MAD R1.xyz, -fragment.color.primary.w, R0.w, R2;\n"
     "MUL R3.xyz, fragment.color.primary.w, R1;\n"
@@ -822,7 +764,6 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "RCP R1.z, R1.z;\n"
     "MAD R1.xyz, R3, R1, R4;\n"
     "MUL R3.xyz, R0, R2.w;\n"
-    "ADD R2.w, -fragment.color.primary, c[1].x;\n"
     "MAD R0.xyz, R0, R2.w, R1;\n"
     "MAD R1.xyz, fragment.color.primary, R1.w, R3;\n"
     "MUL R1.w, fragment.color.primary, R0;\n"
@@ -869,8 +810,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[3] = { program.local[0],\n"
-    "		{ 1, 9.9999997e-06, 2, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 9.9999997e-006, 2, 3 },\n"
+    "		{ 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -882,8 +823,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "MAX R1.x, R0.w, c[1].y;\n"
     "RCP R1.w, R1.x;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R1.xyz, -R2, c[1].w;\n"
-    "ADD R4.xyz, R1, c[2].x;\n"
+    "MUL R1.xyz, -R2, c[2].x;\n"
+    "ADD R4.xyz, R1, c[1].w;\n"
     "MAD R1.xyz, -R0, R1.w, c[1].x;\n"
     "RSQ R2.w, R2.x;\n"
     "RSQ R2.z, R2.z;\n"
@@ -891,25 +832,23 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "RCP R2.x, R2.w;\n"
     "RCP R2.z, R2.z;\n"
     "RCP R2.y, R2.y;\n"
-    "MAD R5.xyz, R2, R0.w, -R0;\n"
+    "MAD R5.xyz, R0.w, R2, -R0;\n"
     "MAD R2.xyz, fragment.color.primary, c[1].z, -fragment.color.primary.w;\n"
     "MUL R3.xyz, R1, R2;\n"
     "MAD R3.xyz, -R3, R4, fragment.color.primary.w;\n"
     "MUL R4.xyz, R5, R2;\n"
     "MAD R1.xyz, -R1, R2, fragment.color.primary.w;\n"
-    "MAD R5.xyz, R0, fragment.color.primary.w, R4;\n"
     "MUL R3.xyz, R0, R3;\n"
-    "MUL R4.xyz, R0, c[1].w;\n"
-    "ADD R5.xyz, R5, -R3;\n"
-    "SGE R4.xyz, R4, R0.w;\n"
-    "MUL R4.xyz, R4, R5;\n"
-    "ADD R2.xyz, R3, R4;\n"
+    "MAD R4.xyz, fragment.color.primary.w, R0, R4;\n"
+    "ADD R5.xyz, R4, -R3;\n"
+    "MUL R4.xyz, R0, c[2].x;\n"
+    "SGE R2.xyz, R4, R0.w;\n"
+    "MAD R2.xyz, R2, R5, R3;\n"
     "MUL R1.xyz, R0, R1;\n"
     "MUL R3.xyz, fragment.color.primary, c[1].z;\n"
     "ADD R2.xyz, R2, -R1;\n"
     "SGE R3.xyz, R3, fragment.color.primary.w;\n"
-    "MUL R2.xyz, R3, R2;\n"
-    "ADD R1.xyz, R1, R2;\n"
+    "MAD R1.xyz, R3, R2, R1;\n"
     "ADD R1.w, -R0, c[1].x;\n"
     "MAD R1.xyz, fragment.color.primary, R1.w, R1;\n"
     "ADD R1.w, fragment.color.primary, R0;\n"
@@ -928,7 +867,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "TEMP R2;\n"
     "MUL R0.xy, fragment.position, c[0];\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R2.xyz, R0, fragment.color.primary.w;\n"
+    "MUL R2.xyz, fragment.color.primary.w, R0;\n"
     "MUL R1.xyz, fragment.color.primary, R0.w;\n"
     "ADD R1.w, fragment.color.primary, R0;\n"
     "MIN R1.xyz, R1, R2;\n"
@@ -941,20 +880,20 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODES_EXCLUSION_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[2] = { program.local[0],\n"
-    "		{ 1, 2 } };\n"
+    "		{ 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "MUL R0.xy, fragment.position, c[0];\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R1.xyz, R0, fragment.color.primary.w;\n"
+    "MUL R1.xyz, fragment.color.primary.w, R0;\n"
     "MAD R2.xyz, fragment.color.primary, R0.w, R1;\n"
     "MUL R1.xyz, fragment.color.primary, R0;\n"
-    "MAD R1.xyz, -R1, c[1].y, R2;\n"
-    "ADD R1.w, -R0, c[1].x;\n"
+    "MAD R1.xyz, -R1, c[1].x, R2;\n"
+    "ADD R1.w, -R0, c[1].y;\n"
     "MAD R1.xyz, fragment.color.primary, R1.w, R1;\n"
     "ADD R1.w, fragment.color.primary, R0;\n"
-    "ADD R2.x, -fragment.color.primary.w, c[1];\n"
+    "ADD R2.x, -fragment.color.primary.w, c[1].y;\n"
     "MAD result.color.xyz, R0, R2.x, R1;\n"
     "MAD result.color.w, -fragment.color.primary, R0, R1;\n"
     "END\n"
@@ -964,8 +903,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
     "!!ARBfp1.0\n"
     "PARAM c[3] = { program.local[0..2] };\n"
     "TEMP R0;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[1];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "DP4 R0.x, R0, c[2];\n"
     "MUL result.color, fragment.color.primary, R0.x;\n"
@@ -974,359 +913,351 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_SOLID_COMPOSITION_MODE_BLEND_MODE_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[1] = { program.local[0] };\n"
     "MOV result.color, fragment.color.primary;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_SIMPLE_PORTER_DUFF =
     "!!ARBfp1.0\n"
-    "PARAM c[12] = { program.local[0..6],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[8..11] };\n"
+    "PARAM c[12] = { program.local[0..10],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
     "ADD R0.z, R0, R0.w;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "RSQ R0.z, R0.y;\n"
-    "RCP R0.z, R0.z;\n"
-    "ADD R0.x, -R0, R0.z;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[9].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MOV R0.y, c[7].x;\n"
-    "MUL R0.y, c[8].x, R0;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.x, R0, R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R2.xyz, R1, c[11].y;\n"
-    "MUL R3.xyz, R2, R0.w;\n"
-    "MUL R2.xyz, R0, c[11].x;\n"
-    "MAD R2.xyz, R2, R1.w, R3;\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "ADD R2.w, -R1, c[7].z;\n"
-    "MUL R0.xyz, R0, c[10].y;\n"
-    "MAD R2.xyz, R0, R2.w, R2;\n"
-    "MUL R0.xyz, R1, c[10].z;\n"
-    "ADD R3.z, -R0.w, c[7];\n"
-    "MAD R2.xyz, R0, R3.z, R2;\n"
-    "MUL R0.y, R0.w, R2.w;\n"
-    "MUL R0.x, R0.w, R1.w;\n"
-    "MUL R0.z, R1.w, R3;\n"
-    "DP3 R2.w, R0, c[10];\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.x, c[11].x;\n"
+    "MUL R0.z, R0, c[11].y;\n"
+    "MAD R0.x, R0.y, R0.y, -R0.z;\n"
+    "RSQ R0.x, R0.x;\n"
+    "RCP R0.z, R0.x;\n"
+    "ADD R1.x, -R0.y, R0.z;\n"
+    "MOV R0.x, c[11];\n"
+    "MUL R0.z, R0.x, c[1].x;\n"
+    "RCP R1.y, R0.z;\n"
+    "MUL R0.xy, fragment.position, c[8];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R2.xyz, R0, c[5].y;\n"
+    "MUL R3.xyz, R1.w, R2;\n"
+    "MUL R2.xyz, R1, c[5].x;\n"
+    "MAD R2.xyz, R0.w, R2, R3;\n"
+    "ADD R3.xy, fragment.position, c[9];\n"
+    "ADD R2.w, -R0, c[11].z;\n"
+    "MUL R1.xyz, R1, c[6].y;\n"
+    "MAD R2.xyz, R2.w, R1, R2;\n"
+    "MUL R1.xyz, R0, c[6].z;\n"
+    "ADD R3.z, -R1.w, c[11];\n"
+    "MAD R2.xyz, R3.z, R1, R2;\n"
+    "MUL R1.y, R1.w, R2.w;\n"
+    "MUL R1.x, R1.w, R0.w;\n"
+    "MUL R1.z, R0.w, R3;\n"
+    "DP3 R2.w, R1, c[6];\n"
+    "MUL R3.xy, R3, c[7];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[10];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_MULTIPLY =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.z, R0.y;\n"
-    "ADD R0.x, -R0, R0.z;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[9].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MOV R0.y, c[7].x;\n"
-    "MUL R0.y, c[8].x, R0;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.x, R0, R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R2.x, -R1.w, c[7].z;\n"
-    "MUL R2.xyz, R0, R2.x;\n"
-    "MAD R0.xyz, R0, R1, R2;\n"
-    "ADD R2.x, -R0.w, c[7].z;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.x, c[9].x;\n"
+    "MUL R0.z, R0, c[9].y;\n"
+    "MAD R0.x, R0.y, R0.y, -R0.z;\n"
+    "RSQ R0.x, R0.x;\n"
+    "RCP R0.z, R0.x;\n"
+    "ADD R1.x, -R0.y, R0.z;\n"
+    "MOV R0.x, c[9];\n"
+    "MUL R0.z, R0.x, c[1].x;\n"
+    "RCP R1.y, R0.z;\n"
+    "MUL R0.xy, fragment.position, c[6];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "ADD R2.x, -R0.w, c[9].z;\n"
+    "MUL R2.xyz, R1, R2.x;\n"
+    "MAD R1.xyz, R1, R0, R2;\n"
+    "ADD R2.x, -R1.w, c[9].z;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, R1, c[5];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[8];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_SCREEN =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[7].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[8].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[9];\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "ADD R3.xy, fragment.position, c[7];\n"
+    "MUL R0.y, R0.z, c[9];\n"
+    "MUL R0.x, R0, c[9];\n"
+    "MAD R0.z, R0.x, R0.x, -R0.y;\n"
+    "MOV R0.y, c[9].x;\n"
+    "RSQ R0.z, R0.z;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R2, R0, R1;\n"
-    "MAD R2, -R0, R1, R2;\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.z, R0.x, R0.y;\n"
+    "TEX R1, R0.z, texture[2], 1D;\n"
+    "MUL R0.xy, fragment.position, c[6];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "ADD R2, R1, R0;\n"
+    "MAD R2, -R1, R0, R2;\n"
+    "MUL R3.xy, R3, c[5];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[8];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_OVERLAY =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[7].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[8].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[9];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R1.xy, fragment.position, c[6];\n"
     "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "MUL R0.y, R0.z, c[9];\n"
+    "MUL R0.x, R0, c[9];\n"
+    "MAD R0.z, R0.x, R0.x, -R0.y;\n"
+    "MOV R0.y, c[9].x;\n"
+    "RSQ R0.z, R0.z;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R2.w, -R1, c[7].z;\n"
+    "ADD R2.w, -R1, c[9].z;\n"
     "ADD R3.xyz, R0.w, -R0;\n"
     "ADD R2.xyz, R1.w, -R1;\n"
     "MUL R2.xyz, R2, R3;\n"
-    "MUL R2.xyz, R2, c[7].x;\n"
+    "MUL R2.xyz, R2, c[9].x;\n"
     "MAD R2.xyz, R0.w, R1.w, -R2;\n"
     "MUL R4.xyz, R0, R2.w;\n"
     "MUL R3.xyz, R0, R1;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].z;\n"
-    "MAD R3.xyz, R3, c[7].x, R4;\n"
+    "ADD R2.x, -R0.w, c[9].z;\n"
+    "MAD R3.xyz, R3, c[9].x, R4;\n"
     "MAD R3.xyz, R1, R2.x, R3;\n"
     "MAD R0.xyz, R1, R2.x, R0;\n"
-    "MUL R2.xyz, R1, c[7].x;\n"
+    "MUL R2.xyz, R1, c[9].x;\n"
     "ADD R0.xyz, R0, -R3;\n"
     "SGE R2.xyz, R2, R1.w;\n"
     "MAD R2.xyz, R2, R0, R3;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[7];\n"
+    "MUL R0.xy, R0, c[5];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[8];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_DARKEN =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[7].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[8].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[9];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
-    "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.x, c[9].x;\n"
+    "MUL R0.z, R0, c[9].y;\n"
+    "MAD R0.x, R0.y, R0.y, -R0.z;\n"
+    "RSQ R0.z, R0.x;\n"
+    "MOV R0.x, c[9];\n"
+    "MUL R0.x, R0, c[1];\n"
+    "RCP R0.z, R0.z;\n"
+    "ADD R0.z, -R0.y, R0;\n"
+    "RCP R0.w, R0.x;\n"
+    "MUL R1.x, R0.z, R0.w;\n"
+    "MUL R0.xy, fragment.position, c[6];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MIN R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[7].z;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].z;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[9].z;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[9].z;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, R1, c[5];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[8];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_LIGHTEN =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[7].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[8].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[9];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
-    "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.x, c[9].x;\n"
+    "MUL R0.z, R0, c[9].y;\n"
+    "MAD R0.x, R0.y, R0.y, -R0.z;\n"
+    "RSQ R0.z, R0.x;\n"
+    "MOV R0.x, c[9];\n"
+    "MUL R0.x, R0, c[1];\n"
+    "RCP R0.z, R0.z;\n"
+    "ADD R0.z, -R0.y, R0;\n"
+    "RCP R0.w, R0.x;\n"
+    "MUL R1.x, R0.z, R0.w;\n"
+    "MUL R0.xy, fragment.position, c[6];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MAX R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[7].z;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].z;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[9].z;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[9].z;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, R1, c[5];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[8];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_COLORDODGE =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4, 1, 1e-06 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4, 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[7].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[8].x, R0;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[9];\n"
+    "MUL R0.x, R0, c[9];\n"
+    "MAD R0.z, R0.x, R0.x, -R0.y;\n"
+    "MOV R0.y, c[9].x;\n"
+    "RSQ R0.z, R0.z;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MAX R1.x, R0.w, c[7].w;\n"
+    "MAX R1.x, R0.w, c[9].w;\n"
     "RCP R1.x, R1.x;\n"
-    "MAD R1.xyz, -R0, R1.x, c[7].z;\n"
-    "MAX R2.xyz, R1, c[7].w;\n"
-    "MUL R1.xy, fragment.position, c[9];\n"
+    "MAD R1.xyz, -R0, R1.x, c[9].z;\n"
+    "MAX R2.xyz, R1, c[9].w;\n"
+    "MUL R1.xy, fragment.position, c[6];\n"
     "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R0, c[7].z;\n"
+    "ADD R2.w, -R0, c[9].z;\n"
     "MUL R3.xyz, R1, R2.w;\n"
-    "ADD R2.w, -R1, c[7].z;\n"
+    "ADD R2.w, -R1, c[9].z;\n"
     "MAD R4.xyz, R0, R2.w, R3;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MUL R2.w, R0, R1;\n"
     "MAD R0.xyz, R0, R1.w, R3;\n"
     "SGE R0.xyz, R0, R2.w;\n"
@@ -1339,57 +1270,56 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
     "MAD R2.xyz, R0, R4, R2;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[7];\n"
+    "MUL R0.xy, R0, c[5];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[8];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_COLORBURN =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4, 1, 9.9999997e-06 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4, 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[9];\n"
+    "MUL R0.x, R0, c[9];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[7].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[8].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[9];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "RSQ R0.z, R0.y;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[6].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MOV R0.y, c[9].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "MAD R2.xyz, -R0.w, R1.w, R3;\n"
     "MUL R4.xyz, R0.w, R2;\n"
-    "MAX R2.xyz, R0, c[7].w;\n"
-    "ADD R2.w, -R1, c[7].z;\n"
+    "MAX R2.xyz, R0, c[9].w;\n"
+    "ADD R2.w, -R1, c[9].z;\n"
     "MUL R5.xyz, R0, R2.w;\n"
-    "ADD R3.w, -R0, c[7].z;\n"
+    "ADD R3.w, -R0, c[9].z;\n"
     "RCP R2.x, R2.x;\n"
     "RCP R2.y, R2.y;\n"
     "RCP R2.z, R2.z;\n"
@@ -1403,60 +1333,59 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
     "MAD R2.xyz, R3, R2, R0;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[7];\n"
+    "MUL R0.xy, R0, c[5];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[8];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_HARDLIGHT =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[7].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[8].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[9];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R1.xy, fragment.position, c[6];\n"
     "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "MUL R0.y, R0.z, c[9];\n"
+    "MUL R0.x, R0, c[9];\n"
+    "MAD R0.z, R0.x, R0.x, -R0.y;\n"
+    "MOV R0.y, c[9].x;\n"
+    "RSQ R0.z, R0.z;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R2.w, -R1, c[7].z;\n"
+    "ADD R2.w, -R1, c[9].z;\n"
     "ADD R3.xyz, R0.w, -R0;\n"
     "ADD R2.xyz, R1.w, -R1;\n"
     "MUL R2.xyz, R2, R3;\n"
-    "MUL R2.xyz, R2, c[7].x;\n"
+    "MUL R2.xyz, R2, c[9].x;\n"
     "MAD R2.xyz, R0.w, R1.w, -R2;\n"
     "MUL R4.xyz, R0, R2.w;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
     "MUL R3.xyz, R0, R1;\n"
-    "ADD R2.w, -R0, c[7].z;\n"
-    "MAD R3.xyz, R3, c[7].x, R4;\n"
-    "MUL R0.xyz, R0, c[7].x;\n"
+    "ADD R2.w, -R0, c[9].z;\n"
+    "MAD R3.xyz, R3, c[9].x, R4;\n"
+    "MUL R0.xyz, R0, c[9].x;\n"
     "SGE R0.xyz, R0, R0.w;\n"
     "MAD R3.xyz, R1, R2.w, R3;\n"
     "MAD R2.xyz, R1, R2.w, R2;\n"
@@ -1464,21 +1393,20 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
     "MAD R2.xyz, R0, R2, R3;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[7];\n"
+    "MUL R0.xy, R0, c[5];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[8];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..6],\n"
-    "		{ 2, 4, 1, 9.9999997e-06 },\n"
-    "		program.local[8..9],\n"
-    "		{ 8, 3 } };\n"
+    "PARAM c[11] = { program.local[0..8],\n"
+    "		{ 2, 4, 1, 9.9999997e-006 },\n"
+    "		{ 3, 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -1486,259 +1414,252 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.zw, fragment.position.xyxy, c[9].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R0.x, R0, c[7];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[9];\n"
+    "MUL R0.x, R0, c[9];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MAX R0.z, R1.w, c[7].w;\n"
-    "RCP R2.w, R0.z;\n"
-    "MUL R2.xyz, R1, R2.w;\n"
-    "MUL R6.xyz, -R2, c[10].x;\n"
-    "MAD R3.xyz, -R1, R2.w, c[7].z;\n"
+    "MOV R0.z, c[9].x;\n"
+    "MUL R1.y, R0.z, c[1].x;\n"
     "RSQ R0.y, R0.y;\n"
     "RCP R0.y, R0.y;\n"
-    "ADD R0.x, -R0, R0.y;\n"
-    "MOV R0.y, c[7].x;\n"
-    "MUL R0.y, c[8].x, R0;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.x, R0, R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MAD R4.xyz, R0, c[7].x, -R0.w;\n"
+    "ADD R1.x, -R0, R0.y;\n"
+    "RCP R1.y, R1.y;\n"
+    "MUL R0.xy, fragment.position, c[6];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MAX R1.z, R0.w, c[9].w;\n"
+    "RCP R2.w, R1.z;\n"
+    "MUL R2.xyz, R0, R2.w;\n"
+    "MAD R6.xyz, -R2, c[10].y, c[10].x;\n"
+    "MAD R3.xyz, -R0, R2.w, c[9].z;\n"
+    "RSQ R2.w, R2.x;\n"
+    "RCP R2.x, R2.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MAD R4.xyz, R1, c[9].x, -R1.w;\n"
     "MUL R5.xyz, R3, R4;\n"
-    "MAD R3.xyz, -R3, R4, R0.w;\n"
-    "ADD R6.xyz, R6, c[10].y;\n"
-    "RSQ R2.x, R2.x;\n"
+    "MAD R5.xyz, -R5, R6, R1.w;\n"
+    "MAD R3.xyz, -R3, R4, R1.w;\n"
     "RSQ R2.z, R2.z;\n"
     "RSQ R2.y, R2.y;\n"
-    "MAD R5.xyz, -R5, R6, R0.w;\n"
-    "MUL R3.xyz, R1, R3;\n"
-    "ADD R2.w, -R1, c[7].z;\n"
-    "RCP R2.x, R2.x;\n"
+    "MUL R5.xyz, R0, R5;\n"
+    "MUL R3.xyz, R0, R3;\n"
+    "ADD R2.w, -R0, c[9].z;\n"
     "RCP R2.z, R2.z;\n"
     "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R2, R1.w, -R1;\n"
-    "MUL R6.xyz, R2, R4;\n"
-    "MUL R2.xyz, R1, R5;\n"
-    "MAD R6.xyz, R1, R0.w, R6;\n"
-    "MUL R4.xyz, R0, c[7].x;\n"
-    "MUL R5.xyz, R1, c[10].x;\n"
-    "ADD R6.xyz, R6, -R2;\n"
-    "SGE R5.xyz, R5, R1.w;\n"
-    "MUL R5.xyz, R5, R6;\n"
-    "ADD R2.xyz, R2, R5;\n"
-    "SGE R4.xyz, R4, R0.w;\n"
+    "MAD R2.xyz, R0.w, R2, -R0;\n"
+    "MUL R2.xyz, R2, R4;\n"
+    "MAD R2.xyz, R1.w, R0, R2;\n"
+    "ADD R6.xyz, R2, -R5;\n"
+    "MUL R4.xyz, R1, c[9].x;\n"
+    "MUL R2.xyz, R0, c[10].y;\n"
+    "SGE R2.xyz, R2, R0.w;\n"
+    "MAD R2.xyz, R2, R6, R5;\n"
+    "SGE R4.xyz, R4, R1.w;\n"
     "ADD R2.xyz, R2, -R3;\n"
-    "MUL R2.xyz, R4, R2;\n"
-    "ADD R2.xyz, R3, R2;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].z;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MAD R2.xyz, R4, R2, R3;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[9].z;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, R1, c[5];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[8];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_DIFFERENCE =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
     "ADD R0.z, R0, R0.w;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "RSQ R0.z, R0.y;\n"
-    "RCP R0.z, R0.z;\n"
-    "ADD R0.x, -R0, R0.z;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[9].xyxy;\n"
-    "MOV R0.y, c[7].x;\n"
-    "MUL R0.y, c[8].x, R0;\n"
-    "RCP R0.y, R0.y;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R0.x, R0, R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R3.xyz, R0, R1;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MUL R0.xyz, R0, R1.w;\n"
-    "MIN R0.xyz, R0, R2;\n"
-    "MAD R2.xyz, -R0, c[7].x, R3;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.x, c[9].x;\n"
+    "MUL R0.z, R0, c[9].y;\n"
+    "MAD R0.x, R0.y, R0.y, -R0.z;\n"
+    "RSQ R0.z, R0.x;\n"
+    "MOV R0.x, c[9];\n"
+    "MUL R0.x, R0, c[1];\n"
+    "RCP R0.z, R0.z;\n"
+    "ADD R0.z, -R0.y, R0;\n"
+    "RCP R0.w, R0.x;\n"
+    "MUL R1.x, R0.z, R0.w;\n"
+    "MUL R0.xy, fragment.position, c[6];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "ADD R2.xyz, R1, R0;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R1.xyz, R1, R0.w;\n"
+    "MIN R1.xyz, R1, R3;\n"
+    "MAD R2.xyz, -R1, c[9].x, R2;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, R1, c[5];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[8];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_EXCLUSION =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..6],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[8..9] };\n"
+    "PARAM c[10] = { program.local[0..8],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[6];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[8].x, -R0;\n"
-    "MUL R0.y, R0.z, c[7];\n"
-    "MUL R0.x, R0, c[7];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[7].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[8].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[9];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
-    "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MAD R3.xyz, R0, R1.w, R2;\n"
-    "MUL R2.xyz, R0, R1;\n"
-    "MAD R2.xyz, -R2, c[7].x, R3;\n"
-    "ADD R2.w, -R1, c[7].z;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].z;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.x, c[9].x;\n"
+    "MUL R0.z, R0, c[9].y;\n"
+    "MAD R0.x, R0.y, R0.y, -R0.z;\n"
+    "RSQ R0.z, R0.x;\n"
+    "MOV R0.x, c[9];\n"
+    "MUL R0.x, R0, c[1];\n"
+    "RCP R0.z, R0.z;\n"
+    "ADD R0.z, -R0.y, R0;\n"
+    "RCP R0.w, R0.x;\n"
+    "MUL R1.x, R0.z, R0.w;\n"
+    "MUL R0.xy, fragment.position, c[6];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R2.xyz, R1.w, R0;\n"
+    "MAD R3.xyz, R1, R0.w, R2;\n"
+    "MUL R2.xyz, R1, R0;\n"
+    "MAD R2.xyz, -R2, c[9].x, R3;\n"
+    "ADD R2.w, -R0, c[9].z;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[9].z;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, R1, c[5];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[8];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_SIMPLE_PORTER_DUFF_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[9] = { program.local[0..3],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[5..8] };\n"
+    "PARAM c[9] = { program.local[0..7],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
-    "MUL R0.xy, R0, c[3];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[8];\n"
+    "MUL R0.x, R0, c[8];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "RSQ R0.z, R0.y;\n"
-    "RCP R0.z, R0.z;\n"
+    "RSQ R0.y, R0.y;\n"
+    "RCP R0.z, R0.y;\n"
     "ADD R0.x, -R0, R0.z;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[6].xyxy;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, c[8].y;\n"
-    "MOV R0.y, c[4].x;\n"
-    "MUL R0.y, c[5].x, R0;\n"
+    "MUL R2.xyz, R1, c[5].y;\n"
+    "MOV R0.y, c[8].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
     "RCP R0.y, R0.y;\n"
     "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MUL R3.xyz, R2, R0.w;\n"
-    "MUL R2.xyz, R0, c[8].x;\n"
-    "MAD R2.xyz, R2, R1.w, R3;\n"
-    "ADD R2.w, -R1, c[4].z;\n"
-    "MUL R0.xyz, R0, c[7].y;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[4].z;\n"
-    "MUL R1.xyz, R1, c[7].z;\n"
-    "MAD result.color.xyz, R1, R2.x, R0;\n"
+    "MUL R3.xyz, R0.w, R2;\n"
+    "MUL R2.xyz, R0, c[5].x;\n"
+    "MAD R2.xyz, R1.w, R2, R3;\n"
+    "ADD R2.w, -R1, c[8].z;\n"
+    "MUL R0.xyz, R0, c[6].y;\n"
+    "MAD R0.xyz, R2.w, R0, R2;\n"
+    "ADD R2.x, -R0.w, c[8].z;\n"
+    "MUL R1.xyz, R1, c[6].z;\n"
+    "MAD result.color.xyz, R2.x, R1, R0;\n"
     "MUL R0.x, R0.w, R1.w;\n"
     "MUL R0.z, R1.w, R2.x;\n"
     "MUL R0.y, R0.w, R2.w;\n"
-    "DP3 result.color.w, R0, c[7];\n"
+    "DP3 result.color.w, R0, c[6];\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_MULTIPLY_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
     "RSQ R0.y, R0.y;\n"
     "RCP R0.z, R0.y;\n"
     "ADD R0.x, -R0, R0.z;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[6].xyxy;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MOV R0.y, c[4].x;\n"
-    "MUL R0.y, c[5].x, R0;\n"
+    "MOV R0.y, c[6].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
     "RCP R0.y, R0.y;\n"
     "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "ADD R2.x, -R1.w, c[4].z;\n"
+    "ADD R2.x, -R1.w, c[6].z;\n"
     "MUL R2.xyz, R0, R2.x;\n"
     "MAD R0.xyz, R0, R1, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].z;\n"
+    "ADD R2.y, -R0.w, c[6].z;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -1746,31 +1667,30 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_SCREEN_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
     "ADD R0.z, R0, R0.w;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
     "RSQ R0.z, R0.y;\n"
     "RCP R0.z, R0.z;\n"
     "ADD R0.x, -R0, R0.z;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[6].xyxy;\n"
-    "MOV R0.y, c[4].x;\n"
-    "MUL R0.y, c[5].x, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "MOV R0.y, c[6].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
     "RCP R0.y, R0.y;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
     "MUL R0.x, R0, R0.y;\n"
@@ -1782,50 +1702,49 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_OVERLAY_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[4].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[5].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[6];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
+    "MAD R0.z, R0.x, R0.x, -R0.y;\n"
+    "MOV R0.y, c[6].x;\n"
+    "RSQ R0.z, R0.z;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "ADD R3.xyz, R0.w, -R0;\n"
     "ADD R2.xyz, R1.w, -R1;\n"
     "MUL R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[4].z;\n"
-    "MUL R2.xyz, R2, c[4].x;\n"
+    "ADD R2.w, -R1, c[6].z;\n"
+    "MUL R2.xyz, R2, c[6].x;\n"
     "MAD R2.xyz, R0.w, R1.w, -R2;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
     "MUL R3.xyz, R0, R2.w;\n"
     "MUL R0.xyz, R0, R1;\n"
-    "ADD R2.w, -R0, c[4].z;\n"
-    "MAD R0.xyz, R0, c[4].x, R3;\n"
+    "ADD R2.w, -R0, c[6].z;\n"
+    "MAD R0.xyz, R0, c[6].x, R3;\n"
     "MAD R0.xyz, R1, R2.w, R0;\n"
     "MAD R2.xyz, R1, R2.w, R2;\n"
-    "MUL R1.xyz, R1, c[4].x;\n"
+    "MUL R1.xyz, R1, c[6].x;\n"
     "ADD R2.w, R0, R1;\n"
     "ADD R2.xyz, R2, -R0;\n"
     "SGE R1.xyz, R1, R1.w;\n"
@@ -1836,43 +1755,42 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_DARKEN_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[4].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[5].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[6];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "RSQ R0.z, R0.y;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MOV R0.y, c[6].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MIN R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[4].z;\n"
+    "ADD R2.w, -R1, c[6].z;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].z;\n"
+    "ADD R2.y, -R0.w, c[6].z;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -1880,43 +1798,42 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_LIGHTEN_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[4].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[5].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[6];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "RSQ R0.z, R0.y;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MOV R0.y, c[6].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MAX R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[4].z;\n"
+    "ADD R2.w, -R1, c[6].z;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].z;\n"
+    "ADD R2.y, -R0.w, c[6].z;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -1924,45 +1841,44 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_COLORDODGE_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4, 1, 1e-06 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4, 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[4].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[5].x, R0;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
+    "MAD R0.z, R0.x, R0.x, -R0.y;\n"
+    "MOV R0.y, c[6].x;\n"
+    "RSQ R0.z, R0.z;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MAX R1.x, R0.w, c[4].w;\n"
+    "MAX R1.x, R0.w, c[6].w;\n"
     "RCP R1.x, R1.x;\n"
-    "MAD R1.xyz, -R0, R1.x, c[4].z;\n"
-    "MAX R2.xyz, R1, c[4].w;\n"
-    "MUL R1.xy, fragment.position, c[6];\n"
+    "MAD R1.xyz, -R0, R1.x, c[6].z;\n"
+    "MAX R2.xyz, R1, c[6].w;\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R0, c[4].z;\n"
+    "ADD R2.w, -R0, c[6].z;\n"
     "MUL R3.xyz, R1, R2.w;\n"
-    "ADD R2.w, -R1, c[4].z;\n"
+    "ADD R2.w, -R1, c[6].z;\n"
     "MAD R3.xyz, R0, R2.w, R3;\n"
-    "MUL R1.xyz, R1, R0.w;\n"
+    "MUL R1.xyz, R0.w, R1;\n"
     "MAD R0.xyz, R0, R1.w, R1;\n"
     "MUL R2.w, R0, R1;\n"
     "RCP R2.x, R2.x;\n"
@@ -1980,46 +1896,45 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_COLORBURN_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4, 1, 9.9999997e-06 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4, 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[4].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[5].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[6];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "RSQ R0.z, R0.y;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MOV R0.y, c[6].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
-    "ADD R2.w, -R1, c[4].z;\n"
+    "ADD R2.w, -R1, c[6].z;\n"
     "MAD R2.xyz, -R0.w, R1.w, R3;\n"
     "MUL R4.xyz, R0.w, R2;\n"
-    "MAX R2.xyz, R0, c[4].w;\n"
+    "MAX R2.xyz, R0, c[6].w;\n"
     "MUL R5.xyz, R0, R2.w;\n"
-    "ADD R3.w, -R0, c[4].z;\n"
+    "ADD R3.w, -R0, c[6].z;\n"
     "RCP R2.x, R2.x;\n"
     "RCP R2.y, R2.y;\n"
     "RCP R2.z, R2.z;\n"
@@ -2038,50 +1953,49 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_HARDLIGHT_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[4].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[5].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[6];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
+    "MAD R0.z, R0.x, R0.x, -R0.y;\n"
+    "MOV R0.y, c[6].x;\n"
+    "RSQ R0.z, R0.z;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "ADD R2.w, -R1, c[4].z;\n"
+    "ADD R2.w, -R1, c[6].z;\n"
     "ADD R3.xyz, R0.w, -R0;\n"
     "ADD R2.xyz, R1.w, -R1;\n"
     "MUL R2.xyz, R2, R3;\n"
-    "MUL R2.xyz, R2, c[4].x;\n"
+    "MUL R2.xyz, R2, c[6].x;\n"
     "MAD R2.xyz, R0.w, R1.w, -R2;\n"
     "MUL R4.xyz, R0, R2.w;\n"
     "MUL R3.xyz, R0, R1;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
-    "ADD R2.w, -R0, c[4].z;\n"
-    "MUL R0.xyz, R0, c[4].x;\n"
+    "ADD R2.w, -R0, c[6].z;\n"
+    "MUL R0.xyz, R0, c[6].x;\n"
     "MAD R2.xyz, R1, R2.w, R2;\n"
-    "MAD R3.xyz, R3, c[4].x, R4;\n"
+    "MAD R3.xyz, R3, c[6].x, R4;\n"
     "MAD R1.xyz, R1, R2.w, R3;\n"
     "ADD R2.w, R0, R1;\n"
     "ADD R2.xyz, R2, -R1;\n"
@@ -2093,10 +2007,9 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..3],\n"
-    "		{ 2, 4, 1, 9.9999997e-06 },\n"
-    "		program.local[5..6],\n"
-    "		{ 8, 3 } };\n"
+    "PARAM c[8] = { program.local[0..5],\n"
+    "		{ 2, 4, 1, 9.9999997e-006 },\n"
+    "		{ 3, 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -2104,64 +2017,61 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.zw, fragment.position.xyxy, c[6].xyxy;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.x, R0, c[6];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MAX R0.z, R1.w, c[4].w;\n"
+    "MAX R0.z, R1.w, c[6].w;\n"
     "RCP R2.w, R0.z;\n"
     "MUL R2.xyz, R1, R2.w;\n"
-    "MUL R6.xyz, -R2, c[7].x;\n"
-    "MAD R3.xyz, -R1, R2.w, c[4].z;\n"
+    "MAD R6.xyz, -R2, c[7].y, c[7].x;\n"
+    "MAD R3.xyz, -R1, R2.w, c[6].z;\n"
+    "RSQ R2.w, R2.x;\n"
+    "RCP R2.x, R2.w;\n"
     "RSQ R0.y, R0.y;\n"
     "RCP R0.y, R0.y;\n"
     "ADD R0.x, -R0, R0.y;\n"
-    "MOV R0.y, c[4].x;\n"
-    "MUL R0.y, c[5].x, R0;\n"
+    "MOV R0.y, c[6].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
     "RCP R0.y, R0.y;\n"
     "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MAD R4.xyz, R0, c[4].x, -R0.w;\n"
+    "MAD R4.xyz, R0, c[6].x, -R0.w;\n"
     "MUL R5.xyz, R3, R4;\n"
+    "MAD R5.xyz, -R5, R6, R0.w;\n"
     "MAD R3.xyz, -R3, R4, R0.w;\n"
-    "ADD R6.xyz, R6, c[7].y;\n"
-    "RSQ R2.x, R2.x;\n"
     "RSQ R2.z, R2.z;\n"
     "RSQ R2.y, R2.y;\n"
-    "MAD R5.xyz, -R5, R6, R0.w;\n"
+    "MUL R5.xyz, R1, R5;\n"
     "MUL R3.xyz, R1, R3;\n"
-    "RCP R2.x, R2.x;\n"
     "RCP R2.z, R2.z;\n"
     "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R2, R1.w, -R1;\n"
-    "MUL R6.xyz, R2, R4;\n"
-    "MUL R2.xyz, R1, R5;\n"
-    "MUL R4.xyz, R0, c[4].x;\n"
-    "MAD R6.xyz, R1, R0.w, R6;\n"
-    "MUL R5.xyz, R1, c[7].x;\n"
-    "ADD R6.xyz, R6, -R2;\n"
-    "SGE R5.xyz, R5, R1.w;\n"
-    "MUL R5.xyz, R5, R6;\n"
-    "ADD R2.xyz, R2, R5;\n"
+    "MAD R2.xyz, R1.w, R2, -R1;\n"
+    "MUL R2.xyz, R2, R4;\n"
+    "MAD R2.xyz, R0.w, R1, R2;\n"
+    "ADD R6.xyz, R2, -R5;\n"
+    "MUL R4.xyz, R0, c[6].x;\n"
+    "MUL R2.xyz, R1, c[7].y;\n"
+    "SGE R2.xyz, R2, R1.w;\n"
+    "MAD R2.xyz, R2, R6, R5;\n"
     "ADD R2.xyz, R2, -R3;\n"
     "SGE R4.xyz, R4, R0.w;\n"
-    "MUL R2.xyz, R4, R2;\n"
-    "ADD R2.xyz, R3, R2;\n"
-    "ADD R2.w, -R1, c[4].z;\n"
+    "MAD R2.xyz, R4, R2, R3;\n"
+    "ADD R2.w, -R1, c[6].z;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].z;\n"
+    "ADD R2.y, -R0.w, c[6].z;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -2169,86 +2079,84 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_DIFFERENCE_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[4].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[5].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[6];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "RSQ R0.z, R0.y;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "MOV R0.y, c[6].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "RCP R0.y, R0.y;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "ADD R0.xyz, R0, R1;\n"
     "MIN R2.xyz, R2, R3;\n"
     "ADD R1.x, R0.w, R1.w;\n"
-    "MAD result.color.xyz, -R2, c[4].x, R0;\n"
+    "MAD result.color.xyz, -R2, c[6].x, R0;\n"
     "MAD result.color.w, -R0, R1, R1.x;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODES_EXCLUSION_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..3],\n"
-    "		{ 2, 4, 1 },\n"
-    "		program.local[5..6] };\n"
+    "PARAM c[7] = { program.local[0..5],\n"
+    "		{ 2, 4, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
     "ADD R0.z, R0, R0.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[6];\n"
+    "MUL R0.x, R0, c[6];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[4].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "RCP R0.y, R0.y;\n"
-    "MUL R0.z, c[5].x, R0;\n"
-    "MUL R1.xy, fragment.position, c[6];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R0.x, -R0, R0.y;\n"
+    "RSQ R0.z, R0.y;\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MOV R0.y, c[6].x;\n"
+    "MUL R0.y, R0, c[1].x;\n"
+    "RCP R0.y, R0.y;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "MUL R2.xyz, R0, R1;\n"
-    "MAD R2.xyz, -R2, c[4].x, R3;\n"
-    "ADD R2.w, -R1, c[4].z;\n"
+    "MAD R2.xyz, -R2, c[6].x, R3;\n"
+    "ADD R2.w, -R1, c[6].z;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].z;\n"
+    "ADD R2.y, -R0.w, c[6].z;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -2256,35 +2164,34 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODE_BLEND_MODE_MASK =
     "!!ARBfp1.0\n"
-    "PARAM c[9] = { program.local[0..3],\n"
-    "		{ 2, 4 },\n"
-    "		program.local[5..8] };\n"
+    "PARAM c[9] = { program.local[0..7],\n"
+    "		{ 2, 4 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.z, R0, R0.w;\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[8];\n"
+    "MUL R0.x, R0, c[8];\n"
     "MAD R0.y, R0.x, R0.x, -R0;\n"
     "RSQ R0.y, R0.y;\n"
     "RCP R0.y, R0.y;\n"
     "ADD R1.x, -R0, R0.y;\n"
-    "MOV R0.z, c[4].x;\n"
-    "MUL R0.z, c[5].x, R0;\n"
+    "MOV R0.z, c[8].x;\n"
+    "MUL R0.z, R0, c[1].x;\n"
     "RCP R1.y, R0.z;\n"
     "ADD R0.xy, fragment.position, c[6];\n"
-    "MUL R0.xy, R0, c[7];\n"
+    "MUL R0.xy, R0, c[5];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MUL R1.x, R1, R1.y;\n"
-    "DP4 R1.y, R0, c[8];\n"
+    "DP4 R1.y, R0, c[7];\n"
     "TEX R0, R1, texture[1], 1D;\n"
     "MUL result.color, R0, R1.y;\n"
     "END\n"
@@ -2292,480 +2199,479 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MOD
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_RADIAL_COMPOSITION_MODE_BLEND_MODE_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[6] = { program.local[0..3],\n"
-    "		{ 2, 4 },\n"
-    "		program.local[5] };\n"
+    "PARAM c[6] = { program.local[0..4],\n"
+    "		{ 2, 4 } };\n"
     "TEMP R0;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[3];\n"
+    "MAD R0.xyz, fragment.position.x, c[2], R0;\n"
+    "ADD R0.xyz, R0, c[4];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.xyxy;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
     "ADD R0.z, R0, R0.w;\n"
-    "MUL R0.z, c[5].x, -R0;\n"
-    "MUL R0.y, R0.z, c[4];\n"
-    "MUL R0.x, R0, c[4];\n"
-    "MAD R0.y, R0.x, R0.x, -R0;\n"
-    "MOV R0.z, c[4].x;\n"
-    "RSQ R0.y, R0.y;\n"
-    "MUL R0.z, c[5].x, R0;\n"
-    "RCP R0.y, R0.y;\n"
+    "MUL R0.z, -R0, c[1].x;\n"
+    "MUL R0.y, R0.z, c[5];\n"
+    "MUL R0.x, R0, c[5];\n"
+    "MAD R0.z, R0.x, R0.x, -R0.y;\n"
+    "MOV R0.y, c[5].x;\n"
+    "RSQ R0.z, R0.z;\n"
+    "MUL R0.y, R0, c[1].x;\n"
     "RCP R0.z, R0.z;\n"
-    "ADD R0.x, -R0, R0.y;\n"
-    "MUL R0.x, R0, R0.z;\n"
+    "RCP R0.y, R0.y;\n"
+    "ADD R0.x, -R0, R0.z;\n"
+    "MUL R0.x, R0, R0.y;\n"
     "TEX result.color, R0, texture[0], 1D;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_SIMPLE_PORTER_DUFF =
     "!!ARBfp1.0\n"
-    "PARAM c[13] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[10..12] };\n"
+    "PARAM c[13] = { program.local[0..9],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
-    "FLR R0.y, R0.x;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[10].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "ADD R0.x, R0, -R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R2.xyz, R1, c[12].y;\n"
-    "MUL R3.xyz, R2, R0.w;\n"
-    "MUL R2.xyz, R0, c[12].x;\n"
-    "MAD R2.xyz, R2, R1.w, R3;\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "ADD R2.w, -R1, c[7];\n"
-    "MUL R0.xyz, R0, c[11].y;\n"
-    "MAD R2.xyz, R0, R2.w, R2;\n"
-    "MUL R0.xyz, R1, c[11].z;\n"
-    "ADD R3.z, -R0.w, c[7].w;\n"
-    "MAD R2.xyz, R0, R3.z, R2;\n"
-    "MUL R0.y, R0.w, R2.w;\n"
-    "MUL R0.x, R0.w, R1.w;\n"
-    "MUL R0.z, R1.w, R3;\n"
-    "DP3 R2.w, R0, c[11];\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[10].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[11].x, c[11].y;\n"
+    "MAD R1.z, R1, R1.y, -c[11];\n"
+    "MAD R1.z, R1, R1.y, c[11].w;\n"
+    "MAD R1.z, R1, R1.y, -c[12].x;\n"
+    "MAD R1.y, R1.z, R1, c[12];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[10].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[10].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R1.x, R0, c[10];\n"
+    "FLR R1.y, R1.x;\n"
+    "MUL R0.xy, fragment.position, c[7];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "ADD R1.x, R1, -R1.y;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R2.xyz, R0, c[4].y;\n"
+    "MUL R3.xyz, R1.w, R2;\n"
+    "MUL R2.xyz, R1, c[4].x;\n"
+    "MAD R2.xyz, R0.w, R2, R3;\n"
+    "ADD R3.xy, fragment.position, c[8];\n"
+    "ADD R2.w, -R0, c[12].z;\n"
+    "MUL R1.xyz, R1, c[5].y;\n"
+    "MAD R2.xyz, R2.w, R1, R2;\n"
+    "MUL R1.xyz, R0, c[5].z;\n"
+    "ADD R3.z, -R1.w, c[12];\n"
+    "MAD R2.xyz, R3.z, R1, R2;\n"
+    "MUL R1.y, R1.w, R2.w;\n"
+    "MUL R1.x, R1.w, R0.w;\n"
+    "MUL R1.z, R0.w, R3;\n"
+    "DP3 R2.w, R1, c[5];\n"
+    "MUL R3.xy, R3, c[6];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[9];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_MULTIPLY =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
-    "FLR R0.y, R0.x;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[10].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "ADD R0.x, R0, -R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R2.x, -R1.w, c[7].w;\n"
-    "MUL R2.xyz, R0, R2.x;\n"
-    "MAD R0.xyz, R0, R1, R2;\n"
-    "ADD R2.x, -R0.w, c[7].w;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[9].x, c[9].y;\n"
+    "MAD R1.z, R1, R1.y, -c[9];\n"
+    "MAD R1.z, R1, R1.y, c[9].w;\n"
+    "MAD R1.z, R1, R1.y, -c[10].x;\n"
+    "MAD R1.y, R1.z, R1, c[10];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[8].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[8].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R1.x, R0, c[8];\n"
+    "FLR R1.y, R1.x;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "ADD R1.x, R1, -R1.y;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "ADD R2.x, -R0.w, c[10].z;\n"
+    "MUL R2.xyz, R1, R2.x;\n"
+    "MAD R1.xyz, R1, R0, R2;\n"
+    "ADD R2.x, -R1.w, c[10].z;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_SCREEN =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MUL R1.xy, fragment.position, c[10];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
+    "ADD R3.xy, fragment.position, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[9].x, c[9].y;\n"
+    "MAD R1.z, R1, R1.y, -c[9];\n"
+    "MAD R1.z, R1, R1.y, c[9].w;\n"
+    "MAD R1.z, R1, R1.y, -c[10].x;\n"
+    "MAD R1.y, R1.z, R1, c[10];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[8].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[8].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[8];\n"
     "FLR R0.y, R0.x;\n"
-    "ADD R0.x, R0, -R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R2, R0, R1;\n"
-    "MAD R2, -R0, R1, R2;\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R0.z, R0.x, -R0.y;\n"
+    "TEX R1, R0.z, texture[2], 1D;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "ADD R2, R1, R0;\n"
+    "MAD R2, -R1, R0, R2;\n"
+    "MUL R3.xy, R3, c[4];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_OVERLAY =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494, 2 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.0020000001, -0.01348047, 0.057477314, 0.12123907 },\n"
+    "		{ 0.19563593, 0.33299461, 0.99999565, 1.5707964 },\n"
+    "		{ 3.1415927, 0.15915494, 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MUL R1.xy, fragment.position, c[10];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R1, c[7];\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8];\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[8].y, c[8];\n"
+    "MAD R1.z, R1, R1.y, -c[8].w;\n"
+    "MAD R1.z, R1, R1.y, c[9].x;\n"
+    "MAD R1.z, R1, R1.y, -c[9].y;\n"
+    "MAD R1.y, R1.z, R1, c[9].z;\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[9].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[10].x;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[10].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[2], 1D;\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
+    "TEX R1, R1, texture[0], 2D;\n"
+    "ADD R2.w, -R1, c[10];\n"
     "ADD R3.xyz, R0.w, -R0;\n"
     "ADD R2.xyz, R1.w, -R1;\n"
     "MUL R2.xyz, R2, R3;\n"
-    "MUL R2.xyz, R2, c[9].y;\n"
+    "MUL R2.xyz, R2, c[10].z;\n"
     "MAD R2.xyz, R0.w, R1.w, -R2;\n"
     "MUL R4.xyz, R0, R2.w;\n"
     "MUL R3.xyz, R0, R1;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].w;\n"
-    "MAD R3.xyz, R3, c[9].y, R4;\n"
+    "ADD R2.x, -R0.w, c[10].w;\n"
+    "MAD R3.xyz, R3, c[10].z, R4;\n"
     "MAD R3.xyz, R1, R2.x, R3;\n"
     "MAD R0.xyz, R1, R2.x, R0;\n"
-    "MUL R2.xyz, R1, c[9].y;\n"
+    "MUL R2.xyz, R1, c[10].z;\n"
     "ADD R0.xyz, R0, -R3;\n"
     "SGE R2.xyz, R2, R1.w;\n"
     "MAD R2.xyz, R2, R0, R3;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_DARKEN =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MUL R1.xy, fragment.position, c[10];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
-    "FLR R0.y, R0.x;\n"
-    "ADD R0.x, R0, -R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[9].x, c[9].y;\n"
+    "MAD R1.z, R1, R1.y, -c[9];\n"
+    "MAD R1.z, R1, R1.y, c[9].w;\n"
+    "MAD R1.z, R1, R1.y, -c[10].x;\n"
+    "MAD R1.y, R1.z, R1, c[10];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[8].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[8].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.z, R0.x, c[8].x;\n"
+    "FLR R0.w, R0.z;\n"
+    "ADD R1.x, R0.z, -R0.w;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MIN R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[7];\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].w;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[10].z;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[10].z;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_LIGHTEN =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MUL R1.xy, fragment.position, c[10];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
-    "FLR R0.y, R0.x;\n"
-    "ADD R0.x, R0, -R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[9].x, c[9].y;\n"
+    "MAD R1.z, R1, R1.y, -c[9];\n"
+    "MAD R1.z, R1, R1.y, c[9].w;\n"
+    "MAD R1.z, R1, R1.y, -c[10].x;\n"
+    "MAD R1.y, R1.z, R1, c[10];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[8].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[8].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.z, R0.x, c[8].x;\n"
+    "FLR R0.w, R0.z;\n"
+    "ADD R1.x, R0.z, -R0.w;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MAX R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[7];\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].w;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[10].z;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[10].z;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_COLORDODGE =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494, 1e-06 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.0020000001, -0.01348047, 0.057477314, 0.12123907 },\n"
+    "		{ 0.19563593, 0.33299461, 0.99999565, 1.5707964 },\n"
+    "		{ 3.1415927, 0.15915494, 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8];\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[8].y, c[8];\n"
+    "MAD R1.z, R1, R1.y, -c[8].w;\n"
+    "MAD R1.z, R1, R1.y, c[9].x;\n"
+    "MAD R1.z, R1, R1.y, -c[9].y;\n"
+    "MAD R1.y, R1.z, R1, c[9].z;\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[9].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[10].x;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[10].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MAX R1.x, R0.w, c[9].y;\n"
+    "MAX R1.x, R0.w, c[10].w;\n"
     "RCP R1.x, R1.x;\n"
-    "MAD R1.xyz, -R0, R1.x, c[7].w;\n"
-    "MAX R2.xyz, R1, c[9].y;\n"
-    "MUL R1.xy, fragment.position, c[10];\n"
+    "MAD R1.xyz, -R0, R1.x, c[10].z;\n"
+    "MAX R2.xyz, R1, c[10].w;\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R0, c[7];\n"
+    "ADD R2.w, -R0, c[10].z;\n"
     "MUL R3.xyz, R1, R2.w;\n"
-    "ADD R2.w, -R1, c[7];\n"
+    "ADD R2.w, -R1, c[10].z;\n"
     "MAD R4.xyz, R0, R2.w, R3;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MUL R2.w, R0, R1;\n"
     "MAD R0.xyz, R0, R1.w, R3;\n"
     "SGE R0.xyz, R0, R2.w;\n"
@@ -2778,70 +2684,70 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
     "MAD R2.xyz, R0, R4, R2;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_COLORBURN =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494, 9.9999997e-06 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.0020000001, -0.01348047, 0.057477314, 0.12123907 },\n"
+    "		{ 0.19563593, 0.33299461, 0.99999565, 1.5707964 },\n"
+    "		{ 3.1415927, 0.15915494, 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MUL R1.xy, fragment.position, c[10];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R1, c[7];\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8];\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[8].y, c[8];\n"
+    "MAD R1.z, R1, R1.y, -c[8].w;\n"
+    "MAD R1.z, R1, R1.y, c[9].x;\n"
+    "MAD R1.z, R1, R1.y, -c[9].y;\n"
+    "MAD R1.y, R1.z, R1, c[9].z;\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[9].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[10].x;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[10].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "MAD R2.xyz, -R0.w, R1.w, R3;\n"
     "MUL R4.xyz, R0.w, R2;\n"
-    "MAX R2.xyz, R0, c[9].y;\n"
-    "ADD R3.w, -R0, c[7];\n"
+    "MAX R2.xyz, R0, c[10].w;\n"
+    "ADD R2.w, -R1, c[10].z;\n"
+    "ADD R3.w, -R0, c[10].z;\n"
     "MUL R5.xyz, R0, R2.w;\n"
     "RCP R2.x, R2.x;\n"
     "RCP R2.y, R2.y;\n"
@@ -2856,74 +2762,74 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
     "MAD R2.xyz, R3, R2, R0;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_HARDLIGHT =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494, 2 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.0020000001, -0.01348047, 0.057477314, 0.12123907 },\n"
+    "		{ 0.19563593, 0.33299461, 0.99999565, 1.5707964 },\n"
+    "		{ 3.1415927, 0.15915494, 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MUL R1.xy, fragment.position, c[10];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R1, c[7];\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8];\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[8].y, c[8];\n"
+    "MAD R1.z, R1, R1.y, -c[8].w;\n"
+    "MAD R1.z, R1, R1.y, c[9].x;\n"
+    "MAD R1.z, R1, R1.y, -c[9].y;\n"
+    "MAD R1.y, R1.z, R1, c[9].z;\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[9].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[10].x;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[10].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[2], 1D;\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
+    "TEX R1, R1, texture[0], 2D;\n"
+    "ADD R2.w, -R1, c[10];\n"
     "ADD R3.xyz, R0.w, -R0;\n"
     "ADD R2.xyz, R1.w, -R1;\n"
     "MUL R2.xyz, R2, R3;\n"
-    "MUL R2.xyz, R2, c[9].y;\n"
+    "MUL R2.xyz, R2, c[10].z;\n"
     "MAD R2.xyz, R0.w, R1.w, -R2;\n"
     "MUL R4.xyz, R0, R2.w;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
     "MUL R3.xyz, R0, R1;\n"
-    "ADD R2.w, -R0, c[7];\n"
-    "MAD R3.xyz, R3, c[9].y, R4;\n"
-    "MUL R0.xyz, R0, c[9].y;\n"
+    "ADD R2.w, -R0, c[10];\n"
+    "MAD R3.xyz, R3, c[10].z, R4;\n"
+    "MUL R0.xyz, R0, c[10].z;\n"
     "SGE R0.xyz, R0, R0.w;\n"
     "MAD R3.xyz, R1, R2.w, R3;\n"
     "MAD R2.xyz, R1, R2.w, R2;\n"
@@ -2931,24 +2837,22 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
     "MAD R2.xyz, R0, R2, R3;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
-    "PARAM c[12] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494, 9.9999997e-06, 2, 8 },\n"
-    "		program.local[10],\n"
-    "		{ 3 } };\n"
+    "PARAM c[12] = { program.local[0..7],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1, 9.9999997e-006 },\n"
+    "		{ 2, 3, 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -2956,326 +2860,325 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MOV R1.x, c[7].y;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[10].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
-    "FLR R0.y, R0.x;\n"
-    "MAX R0.z, R1.w, c[9].y;\n"
-    "RCP R2.w, R0.z;\n"
-    "MUL R2.xyz, R1, R2.w;\n"
-    "RSQ R3.w, R2.x;\n"
-    "RSQ R4.y, R2.z;\n"
-    "RCP R4.x, R3.w;\n"
-    "ADD R0.x, R0, -R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MAD R3.xyz, R0, c[9].z, -R0.w;\n"
-    "RSQ R3.w, R2.y;\n"
-    "RCP R4.z, R4.y;\n"
-    "RCP R4.y, R3.w;\n"
-    "MAD R4.xyz, R4, R1.w, -R1;\n"
-    "MUL R6.xyz, R4, R3;\n"
-    "MUL R4.xyz, -R2, c[9].w;\n"
-    "MAD R2.xyz, -R1, R2.w, c[7].w;\n"
-    "ADD R5.xyz, R4, c[11].x;\n"
-    "MUL R4.xyz, R2, R3;\n"
-    "MAD R4.xyz, -R4, R5, R0.w;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
-    "MAD R5.xyz, R1, R0.w, R6;\n"
-    "MUL R4.xyz, R1, R4;\n"
-    "MUL R6.xyz, R1, c[9].w;\n"
-    "ADD R5.xyz, R5, -R4;\n"
-    "SGE R6.xyz, R6, R1.w;\n"
-    "MUL R5.xyz, R6, R5;\n"
-    "ADD R3.xyz, R4, R5;\n"
-    "MUL R2.xyz, R1, R2;\n"
-    "MUL R4.xyz, R0, c[9].z;\n"
-    "ADD R3.xyz, R3, -R2;\n"
-    "SGE R4.xyz, R4, R0.w;\n"
-    "MUL R3.xyz, R4, R3;\n"
-    "ADD R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[7];\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].w;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[9].x, c[9].y;\n"
+    "MAD R1.z, R1, R1.y, -c[9];\n"
+    "MAD R1.z, R1, R1.y, c[9].w;\n"
+    "MAD R1.z, R1, R1.y, -c[10].x;\n"
+    "MAD R1.y, R1.z, R1, c[10];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[8].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[8].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R1.x, R0, c[8];\n"
+    "FLR R1.y, R1.x;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MAX R2.x, R0.w, c[10].w;\n"
+    "RCP R2.w, R2.x;\n"
+    "MUL R2.xyz, R0, R2.w;\n"
+    "MAD R6.xyz, -R2, c[11].z, c[11].y;\n"
+    "MAD R3.xyz, -R0, R2.w, c[10].z;\n"
+    "RSQ R2.w, R2.x;\n"
+    "RCP R2.x, R2.w;\n"
+    "ADD R1.x, R1, -R1.y;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MAD R4.xyz, R1, c[11].x, -R1.w;\n"
+    "MUL R5.xyz, R3, R4;\n"
+    "MAD R5.xyz, -R5, R6, R1.w;\n"
+    "MAD R3.xyz, -R3, R4, R1.w;\n"
+    "RSQ R2.z, R2.z;\n"
+    "RSQ R2.y, R2.y;\n"
+    "MUL R5.xyz, R0, R5;\n"
+    "MUL R3.xyz, R0, R3;\n"
+    "ADD R2.w, -R0, c[10].z;\n"
+    "RCP R2.z, R2.z;\n"
+    "RCP R2.y, R2.y;\n"
+    "MAD R2.xyz, R0.w, R2, -R0;\n"
+    "MUL R2.xyz, R2, R4;\n"
+    "MAD R2.xyz, R1.w, R0, R2;\n"
+    "ADD R6.xyz, R2, -R5;\n"
+    "MUL R4.xyz, R1, c[11].x;\n"
+    "MUL R2.xyz, R0, c[11].z;\n"
+    "SGE R2.xyz, R2, R0.w;\n"
+    "MAD R2.xyz, R2, R6, R5;\n"
+    "SGE R4.xyz, R4, R1.w;\n"
+    "ADD R2.xyz, R2, -R3;\n"
+    "MAD R2.xyz, R4, R2, R3;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[10].z;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_DIFFERENCE =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494, 2 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 2 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
-    "FLR R0.y, R0.x;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[10].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "ADD R0.x, R0, -R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R3.xyz, R0, R1;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MUL R0.xyz, R0, R1.w;\n"
-    "MIN R0.xyz, R0, R2;\n"
-    "MAD R2.xyz, -R0, c[9].y, R3;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[9].x, c[9].y;\n"
+    "MAD R1.z, R1, R1.y, -c[9];\n"
+    "MAD R1.z, R1, R1.y, c[9].w;\n"
+    "MAD R1.z, R1, R1.y, -c[10].x;\n"
+    "MAD R1.y, R1.z, R1, c[10];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[8].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[8].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.z, R0.x, c[8].x;\n"
+    "FLR R0.w, R0.z;\n"
+    "ADD R1.x, R0.z, -R0.w;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "ADD R2.xyz, R1, R0;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R1.xyz, R1, R0.w;\n"
+    "MIN R1.xyz, R1, R3;\n"
+    "MAD R2.xyz, -R1, c[10].z, R2;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_EXCLUSION =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..5],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[8],\n"
-    "		{ 0.15915494, 2 },\n"
-    "		program.local[10] };\n"
+    "PARAM c[11] = { program.local[0..7],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[6].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[6].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[7].y;\n"
-    "CMP R0.x, R0, c[7], R1;\n"
-    "MAD R0.w, R0, c[6].z, -c[6];\n"
-    "MUL R1.xy, fragment.position, c[10];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[7].z, c[7].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[8];\n"
-    "MUL R0.x, R0, c[9];\n"
-    "FLR R0.y, R0.x;\n"
-    "ADD R0.x, R0, -R0.y;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MAD R3.xyz, R0, R1.w, R2;\n"
-    "MUL R2.xyz, R0, R1;\n"
-    "MAD R2.xyz, -R2, c[9].y, R3;\n"
-    "ADD R2.w, -R1, c[7];\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[7].w;\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[8].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[9].x, c[9].y;\n"
+    "MAD R1.z, R1, R1.y, -c[9];\n"
+    "MAD R1.z, R1, R1.y, c[9].w;\n"
+    "MAD R1.z, R1, R1.y, -c[10].x;\n"
+    "MAD R1.y, R1.z, R1, c[10];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[8].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[8].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.z, R0.x, c[8].x;\n"
+    "FLR R0.w, R0.z;\n"
+    "ADD R1.x, R0.z, -R0.w;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R2.xyz, R1.w, R0;\n"
+    "MAD R3.xyz, R1, R0.w, R2;\n"
+    "MUL R2.xyz, R1, R0;\n"
+    "MAD R2.xyz, -R2, c[10].z, R3;\n"
+    "ADD R2.w, -R0, c[10];\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[10].w;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_SIMPLE_PORTER_DUFF_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[7..9] };\n"
+    "PARAM c[10] = { program.local[0..6],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
-    "FLR R0.y, R0.x;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[7].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[8].x, c[8].y;\n"
+    "MAD R1.z, R1, R1.y, -c[8];\n"
+    "MAD R1.z, R1, R1.y, c[8].w;\n"
+    "MAD R1.z, R1, R1.y, -c[9].x;\n"
+    "MAD R1.y, R1.z, R1, c[9];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[7].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[7].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[6].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, c[9].y;\n"
+    "MUL R2.xyz, R1, c[4].y;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[7];\n"
+    "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MUL R3.xyz, R2, R0.w;\n"
-    "MUL R2.xyz, R0, c[9].x;\n"
-    "MAD R2.xyz, R2, R1.w, R3;\n"
-    "ADD R2.w, -R1, c[4];\n"
-    "MUL R0.xyz, R0, c[8].y;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[4].w;\n"
-    "MUL R1.xyz, R1, c[8].z;\n"
-    "MAD result.color.xyz, R1, R2.x, R0;\n"
+    "MUL R3.xyz, R0.w, R2;\n"
+    "MUL R2.xyz, R0, c[4].x;\n"
+    "MAD R2.xyz, R1.w, R2, R3;\n"
+    "ADD R2.w, -R1, c[9].z;\n"
+    "MUL R0.xyz, R0, c[5].y;\n"
+    "MAD R0.xyz, R2.w, R0, R2;\n"
+    "ADD R2.x, -R0.w, c[9].z;\n"
+    "MUL R1.xyz, R1, c[5].z;\n"
+    "MAD result.color.xyz, R2.x, R1, R0;\n"
     "MUL R0.x, R0.w, R1.w;\n"
     "MUL R0.z, R1.w, R2.x;\n"
     "MUL R0.y, R0.w, R2.w;\n"
-    "DP3 result.color.w, R0, c[8];\n"
+    "DP3 result.color.w, R0, c[5];\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_MULTIPLY_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
-    "FLR R0.y, R0.x;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[6].x, c[6].y;\n"
+    "MAD R1.z, R1, R1.y, -c[6];\n"
+    "MAD R1.z, R1, R1.y, c[6].w;\n"
+    "MAD R1.z, R1, R1.y, -c[7].x;\n"
+    "MAD R1.y, R1.z, R1, c[7];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[5].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[5].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[5];\n"
+    "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "ADD R2.x, -R1.w, c[4].w;\n"
+    "ADD R2.x, -R1.w, c[7].z;\n"
     "MUL R2.xyz, R0, R2.x;\n"
     "MAD R0.xyz, R0, R1, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].w;\n"
+    "ADD R2.y, -R0.w, c[7].z;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -3283,46 +3186,46 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_SCREEN_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[6].x, c[6].y;\n"
+    "MAD R1.z, R1, R1.y, -c[6];\n"
+    "MAD R1.z, R1, R1.y, c[6].w;\n"
+    "MAD R1.z, R1, R1.y, -c[7].x;\n"
+    "MAD R1.y, R1.z, R1, c[7];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[5].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[5].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[5];\n"
     "FLR R0.y, R0.x;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
@@ -3333,64 +3236,64 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_OVERLAY_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494, 2 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.0020000001, -0.01348047, 0.057477314, 0.12123907 },\n"
+    "		{ 0.19563593, 0.33299461, 0.99999565, 1.5707964 },\n"
+    "		{ 3.1415927, 0.15915494, 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R1, c[4];\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5];\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[5].y, c[5];\n"
+    "MAD R1.z, R1, R1.y, -c[5].w;\n"
+    "MAD R1.z, R1, R1.y, c[6].x;\n"
+    "MAD R1.z, R1, R1.y, -c[6].y;\n"
+    "MAD R1.y, R1.z, R1, c[6].z;\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[6].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[7].x;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[7].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
+    "MUL R1.xy, fragment.position, c[4];\n"
+    "TEX R1, R1, texture[0], 2D;\n"
     "ADD R3.xyz, R0.w, -R0;\n"
     "ADD R2.xyz, R1.w, -R1;\n"
     "MUL R2.xyz, R2, R3;\n"
-    "MUL R2.xyz, R2, c[6].y;\n"
+    "ADD R2.w, -R1, c[7];\n"
+    "MUL R2.xyz, R2, c[7].z;\n"
     "MAD R2.xyz, R0.w, R1.w, -R2;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
     "MUL R3.xyz, R0, R2.w;\n"
     "MUL R0.xyz, R0, R1;\n"
-    "ADD R2.w, -R0, c[4];\n"
-    "MAD R0.xyz, R0, c[6].y, R3;\n"
+    "ADD R2.w, -R0, c[7];\n"
+    "MAD R0.xyz, R0, c[7].z, R3;\n"
     "MAD R0.xyz, R1, R2.w, R0;\n"
     "MAD R2.xyz, R1, R2.w, R2;\n"
-    "MUL R1.xyz, R1, c[6].y;\n"
+    "MUL R1.xyz, R1, c[7].z;\n"
     "ADD R2.w, R0, R1;\n"
     "ADD R2.xyz, R2, -R0;\n"
     "SGE R1.xyz, R1, R1.w;\n"
@@ -3401,57 +3304,57 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_DARKEN_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[6].x, c[6].y;\n"
+    "MAD R1.z, R1, R1.y, -c[6];\n"
+    "MAD R1.z, R1, R1.y, c[6].w;\n"
+    "MAD R1.z, R1, R1.y, -c[7].x;\n"
+    "MAD R1.y, R1.z, R1, c[7];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[5].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[5].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[5];\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MIN R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[4];\n"
+    "ADD R2.w, -R1, c[7].z;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].w;\n"
+    "ADD R2.y, -R0.w, c[7].z;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -3459,57 +3362,57 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_LIGHTEN_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[6].x, c[6].y;\n"
+    "MAD R1.z, R1, R1.y, -c[6];\n"
+    "MAD R1.z, R1, R1.y, c[6].w;\n"
+    "MAD R1.z, R1, R1.y, -c[7].x;\n"
+    "MAD R1.y, R1.z, R1, c[7];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[5].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[5].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[5];\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MAX R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[4];\n"
+    "ADD R2.w, -R1, c[7].z;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].w;\n"
+    "ADD R2.y, -R0.w, c[7].z;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -3517,59 +3420,59 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_COLORDODGE_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494, 1e-06 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.0020000001, -0.01348047, 0.057477314, 0.12123907 },\n"
+    "		{ 0.19563593, 0.33299461, 0.99999565, 1.5707964 },\n"
+    "		{ 3.1415927, 0.15915494, 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5];\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[5].y, c[5];\n"
+    "MAD R1.z, R1, R1.y, -c[5].w;\n"
+    "MAD R1.z, R1, R1.y, c[6].x;\n"
+    "MAD R1.z, R1, R1.y, -c[6].y;\n"
+    "MAD R1.y, R1.z, R1, c[6].z;\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[6].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[7].x;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[7].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MAX R1.x, R0.w, c[6].y;\n"
+    "MAX R1.x, R0.w, c[7].w;\n"
     "RCP R1.x, R1.x;\n"
-    "MAD R1.xyz, -R0, R1.x, c[4].w;\n"
-    "MAX R2.xyz, R1, c[6].y;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
+    "MAD R1.xyz, -R0, R1.x, c[7].z;\n"
+    "MAX R2.xyz, R1, c[7].w;\n"
+    "MUL R1.xy, fragment.position, c[4];\n"
     "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R0, c[4];\n"
+    "ADD R2.w, -R0, c[7].z;\n"
     "MUL R3.xyz, R1, R2.w;\n"
-    "ADD R2.w, -R1, c[4];\n"
+    "ADD R2.w, -R1, c[7].z;\n"
     "MAD R3.xyz, R0, R2.w, R3;\n"
-    "MUL R1.xyz, R1, R0.w;\n"
+    "MUL R1.xyz, R0.w, R1;\n"
     "MAD R0.xyz, R0, R1.w, R1;\n"
     "MUL R2.w, R0, R1;\n"
     "RCP R2.x, R2.x;\n"
@@ -3587,60 +3490,60 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_COLORBURN_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494, 9.9999997e-06 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.0020000001, -0.01348047, 0.057477314, 0.12123907 },\n"
+    "		{ 0.19563593, 0.33299461, 0.99999565, 1.5707964 },\n"
+    "		{ 3.1415927, 0.15915494, 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R1, c[4];\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5];\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[5].y, c[5];\n"
+    "MAD R1.z, R1, R1.y, -c[5].w;\n"
+    "MAD R1.z, R1, R1.y, c[6].x;\n"
+    "MAD R1.z, R1, R1.y, -c[6].y;\n"
+    "MAD R1.y, R1.z, R1, c[6].z;\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[6].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[7].x;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[7].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
+    "ADD R2.w, -R1, c[7].z;\n"
     "MAD R2.xyz, -R0.w, R1.w, R3;\n"
     "MUL R4.xyz, R0.w, R2;\n"
-    "MAX R2.xyz, R0, c[6].y;\n"
+    "MAX R2.xyz, R0, c[7].w;\n"
     "MUL R5.xyz, R0, R2.w;\n"
-    "ADD R3.w, -R0, c[4];\n"
+    "ADD R3.w, -R0, c[7].z;\n"
     "RCP R2.x, R2.x;\n"
     "RCP R2.y, R2.y;\n"
     "RCP R2.z, R2.z;\n"
@@ -3659,64 +3562,64 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_HARDLIGHT_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494, 2 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.0020000001, -0.01348047, 0.057477314, 0.12123907 },\n"
+    "		{ 0.19563593, 0.33299461, 0.99999565, 1.5707964 },\n"
+    "		{ 3.1415927, 0.15915494, 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R1, c[4];\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5];\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[5].y, c[5];\n"
+    "MAD R1.z, R1, R1.y, -c[5].w;\n"
+    "MAD R1.z, R1, R1.y, c[6].x;\n"
+    "MAD R1.z, R1, R1.y, -c[6].y;\n"
+    "MAD R1.y, R1.z, R1, c[6].z;\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[6].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[7].x;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[7].y;\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
+    "MUL R1.xy, fragment.position, c[4];\n"
+    "TEX R1, R1, texture[0], 2D;\n"
+    "ADD R2.w, -R1, c[7];\n"
     "ADD R3.xyz, R0.w, -R0;\n"
     "ADD R2.xyz, R1.w, -R1;\n"
     "MUL R2.xyz, R2, R3;\n"
-    "MUL R2.xyz, R2, c[6].y;\n"
+    "MUL R2.xyz, R2, c[7].z;\n"
     "MAD R2.xyz, R0.w, R1.w, -R2;\n"
     "MUL R4.xyz, R0, R2.w;\n"
     "MUL R3.xyz, R0, R1;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
-    "ADD R2.w, -R0, c[4];\n"
-    "MUL R0.xyz, R0, c[6].y;\n"
+    "ADD R2.w, -R0, c[7];\n"
+    "MUL R0.xyz, R0, c[7].z;\n"
     "MAD R2.xyz, R1, R2.w, R2;\n"
-    "MAD R3.xyz, R3, c[6].y, R4;\n"
+    "MAD R3.xyz, R3, c[7].z, R4;\n"
     "MAD R1.xyz, R1, R2.w, R3;\n"
     "ADD R2.w, R0, R1;\n"
     "ADD R2.xyz, R2, -R1;\n"
@@ -3728,13 +3631,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[9] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494, 9.9999997e-06, 2, 8 },\n"
-    "		program.local[7],\n"
-    "		{ 3 } };\n"
+    "PARAM c[9] = { program.local[0..4],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 1, 9.9999997e-006 },\n"
+    "		{ 2, 3, 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -3742,75 +3643,74 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MOV R1.x, c[4].y;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[6].x, c[6].y;\n"
+    "MAD R1.z, R1, R1.y, -c[6];\n"
+    "MAD R1.z, R1, R1.y, c[6].w;\n"
+    "MAD R1.z, R1, R1.y, -c[7].x;\n"
+    "MAD R1.y, R1.z, R1, c[7];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[5].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[5].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
-    "FLR R0.y, R0.x;\n"
-    "MAX R0.z, R1.w, c[6].y;\n"
-    "RCP R2.w, R0.z;\n"
+    "MAX R2.x, R1.w, c[7].w;\n"
+    "RCP R2.w, R2.x;\n"
     "MUL R2.xyz, R1, R2.w;\n"
-    "RSQ R3.w, R2.x;\n"
-    "RSQ R4.y, R2.z;\n"
-    "RCP R4.x, R3.w;\n"
+    "MAD R6.xyz, -R2, c[8].z, c[8].y;\n"
+    "MAD R3.xyz, -R1, R2.w, c[7].z;\n"
+    "RSQ R2.w, R2.x;\n"
+    "RCP R2.x, R2.w;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[5];\n"
+    "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MAD R3.xyz, R0, c[6].z, -R0.w;\n"
-    "RSQ R3.w, R2.y;\n"
-    "RCP R4.z, R4.y;\n"
-    "RCP R4.y, R3.w;\n"
-    "MAD R4.xyz, R4, R1.w, -R1;\n"
-    "MUL R6.xyz, R4, R3;\n"
-    "MUL R4.xyz, -R2, c[6].w;\n"
-    "MAD R2.xyz, -R1, R2.w, c[4].w;\n"
-    "ADD R5.xyz, R4, c[8].x;\n"
-    "MUL R4.xyz, R2, R3;\n"
-    "MAD R4.xyz, -R4, R5, R0.w;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
-    "MAD R5.xyz, R1, R0.w, R6;\n"
-    "MUL R4.xyz, R1, R4;\n"
-    "MUL R6.xyz, R1, c[6].w;\n"
-    "ADD R5.xyz, R5, -R4;\n"
-    "SGE R6.xyz, R6, R1.w;\n"
-    "MUL R5.xyz, R6, R5;\n"
-    "ADD R3.xyz, R4, R5;\n"
-    "MUL R2.xyz, R1, R2;\n"
-    "MUL R4.xyz, R0, c[6].z;\n"
-    "ADD R3.xyz, R3, -R2;\n"
+    "MAD R4.xyz, R0, c[8].x, -R0.w;\n"
+    "MUL R5.xyz, R3, R4;\n"
+    "MAD R5.xyz, -R5, R6, R0.w;\n"
+    "MAD R3.xyz, -R3, R4, R0.w;\n"
+    "RSQ R2.z, R2.z;\n"
+    "RSQ R2.y, R2.y;\n"
+    "MUL R5.xyz, R1, R5;\n"
+    "MUL R3.xyz, R1, R3;\n"
+    "RCP R2.z, R2.z;\n"
+    "RCP R2.y, R2.y;\n"
+    "MAD R2.xyz, R1.w, R2, -R1;\n"
+    "MUL R2.xyz, R2, R4;\n"
+    "MAD R2.xyz, R0.w, R1, R2;\n"
+    "ADD R6.xyz, R2, -R5;\n"
+    "MUL R4.xyz, R0, c[8].x;\n"
+    "MUL R2.xyz, R1, c[8].z;\n"
+    "SGE R2.xyz, R2, R1.w;\n"
+    "MAD R2.xyz, R2, R6, R5;\n"
+    "ADD R2.xyz, R2, -R3;\n"
     "SGE R4.xyz, R4, R0.w;\n"
-    "MUL R3.xyz, R4, R3;\n"
-    "ADD R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[4];\n"
+    "MAD R2.xyz, R4, R2, R3;\n"
+    "ADD R2.w, -R1, c[7].z;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].w;\n"
+    "ADD R2.y, -R0.w, c[7].z;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -3818,114 +3718,114 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_DIFFERENCE_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494, 2 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 2 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[6].x, c[6].y;\n"
+    "MAD R1.z, R1, R1.y, -c[6];\n"
+    "MAD R1.z, R1, R1.y, c[6].w;\n"
+    "MAD R1.z, R1, R1.y, -c[7].x;\n"
+    "MAD R1.y, R1.z, R1, c[7];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[5].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[5].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[5];\n"
     "FLR R0.y, R0.x;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "ADD R0.xyz, R0, R1;\n"
     "MIN R2.xyz, R2, R3;\n"
     "ADD R1.x, R0.w, R1.w;\n"
-    "MAD result.color.xyz, -R2, c[6].y, R0;\n"
+    "MAD result.color.xyz, -R2, c[7].z, R0;\n"
     "MAD result.color.w, -R0, R1, R1.x;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODES_EXCLUSION_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494, 2 },\n"
-    "		program.local[7] };\n"
+    "PARAM c[8] = { program.local[0..4],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565, 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[5].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[6].x, c[6].y;\n"
+    "MAD R1.z, R1, R1.y, -c[6];\n"
+    "MAD R1.z, R1, R1.y, c[6].w;\n"
+    "MAD R1.z, R1, R1.y, -c[7].x;\n"
+    "MAD R1.y, R1.z, R1, c[7];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[5].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[5].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[5];\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "MUL R2.xyz, R0, R1;\n"
-    "MAD R2.xyz, -R2, c[6].y, R3;\n"
-    "ADD R2.w, -R1, c[4];\n"
+    "MAD R2.xyz, -R2, c[7].z, R3;\n"
+    "ADD R2.w, -R1, c[7];\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[4].w;\n"
+    "ADD R2.y, -R0.w, c[7].w;\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -3933,49 +3833,49 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODE_BLEND_MODE_MASK =
     "!!ARBfp1.0\n"
-    "PARAM c[10] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494 },\n"
-    "		program.local[7..9] };\n"
+    "PARAM c[10] = { program.local[0..6],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.y, R0.w;\n"
-    "RCP R1.x, R1.x;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.z, R0.x, R0.y, c[5].x;\n"
-    "MUL R1.x, R0.z, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[7].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[8].x, c[8].y;\n"
+    "MAD R1.z, R1, R1.y, -c[8];\n"
+    "MAD R1.z, R1, R1.y, c[8].w;\n"
+    "MAD R1.z, R1, R1.y, -c[9].x;\n"
+    "MAD R1.y, R1.z, R1, c[9];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R1.y, -R1.x, c[7].w;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[7].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.z, R0.x, c[0].x;\n"
+    "MUL R1.x, R0.z, c[7];\n"
     "FLR R1.y, R1.x;\n"
-    "ADD R0.xy, fragment.position, c[7];\n"
-    "MUL R0.xy, R0, c[8];\n"
+    "ADD R0.xy, fragment.position, c[5];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "ADD R1.x, R1, -R1.y;\n"
-    "DP4 R1.y, R0, c[9];\n"
+    "DP4 R1.y, R0, c[6];\n"
     "TEX R0, R1, texture[1], 1D;\n"
     "MUL result.color, R0, R1.y;\n"
     "END\n"
@@ -3983,42 +3883,43 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MODE_BLEND_MODE_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[7] = { program.local[0..2],\n"
-    "		{ 0.0020000001, 9.9999997e-10, 0.1963, 0.9817 },\n"
-    "		{ 2.3561945, 0.78539819, -1, 1 },\n"
-    "		program.local[5],\n"
-    "		{ 0.15915494 } };\n"
+    "PARAM c[7] = { program.local[0..3],\n"
+    "		{ 0.15915494, 0.0020000001, 3.1415927, 1.5707964 },\n"
+    "		{ -0.01348047, 0.057477314, 0.12123907, 0.19563593 },\n"
+    "		{ 0.33299461, 0.99999565 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "ABS R0.w, R0.x;\n"
-    "ABS R0.z, R0.y;\n"
-    "ADD R0.z, R0, -R0.w;\n"
-    "ADD R0.w, R0.y, c[3].x;\n"
-    "ABS R0.z, R0;\n"
-    "CMP R0.y, -R0.z, R0, R0.w;\n"
-    "ABS R0.z, -R0.y;\n"
-    "ADD R0.z, R0, c[3].y;\n"
-    "ADD R0.w, R0.x, R0.z;\n"
-    "ADD R1.x, R0.z, -R0;\n"
-    "RCP R1.x, R1.x;\n"
-    "RCP R1.y, R0.w;\n"
-    "MUL R0.w, R0, R1.x;\n"
-    "ADD R0.z, R0.x, -R0;\n"
-    "MUL R0.z, R0, R1.y;\n"
-    "CMP R0.z, R0.x, R0.w, R0;\n"
-    "MUL R0.w, R0.z, R0.z;\n"
-    "MOV R1.x, c[4].y;\n"
-    "CMP R0.y, -R0, c[4].z, c[4].w;\n"
-    "MAD R0.w, R0, c[3].z, -c[3];\n"
-    "CMP R0.x, R0, c[4], R1;\n"
-    "MAD R0.x, R0.w, R0.z, R0;\n"
-    "MAD R0.x, R0, R0.y, c[5];\n"
-    "MUL R0.x, R0, c[6];\n"
+    "ABS R0.z, R0.x;\n"
+    "ABS R0.w, R0.y;\n"
+    "ADD R0.w, R0, -R0.z;\n"
+    "ADD R1.x, R0.y, c[4].y;\n"
+    "ABS R0.w, R0;\n"
+    "CMP R0.y, -R0.w, R0, R1.x;\n"
+    "ABS R0.w, -R0.y;\n"
+    "MAX R1.x, R0.z, R0.w;\n"
+    "RCP R1.y, R1.x;\n"
+    "MIN R1.x, R0.z, R0.w;\n"
+    "MUL R1.x, R1, R1.y;\n"
+    "MUL R1.y, R1.x, R1.x;\n"
+    "MAD R1.z, R1.y, c[5].x, c[5].y;\n"
+    "MAD R1.z, R1, R1.y, -c[5];\n"
+    "MAD R1.z, R1, R1.y, c[5].w;\n"
+    "MAD R1.z, R1, R1.y, -c[6].x;\n"
+    "MAD R1.y, R1.z, R1, c[6];\n"
+    "MUL R1.x, R1.y, R1;\n"
+    "ADD R0.z, -R0, R0.w;\n"
+    "ADD R1.y, -R1.x, c[4].w;\n"
+    "CMP R0.z, -R0, R1.y, R1.x;\n"
+    "ADD R0.w, -R0.z, c[4].z;\n"
+    "CMP R0.x, R0, R0.w, R0.z;\n"
+    "CMP R0.x, -R0.y, -R0, R0;\n"
+    "ADD R0.x, R0, c[0];\n"
+    "MUL R0.x, R0, c[4];\n"
     "FLR R0.y, R0.x;\n"
     "ADD R0.x, R0, -R0.y;\n"
     "TEX result.color, R0, texture[0], 1D;\n"
@@ -4027,45 +3928,43 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_CONICAL_COMPOSITION_MO
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_SIMPLE_PORTER_DUFF =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..7],\n"
-    "		{ 1 },\n"
-    "		program.local[9..10] };\n"
+    "PARAM c[11] = { program.local[0..9],\n"
+    "		{ 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R0.x, R0, c[6].z;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R2.xyz, R1, c[10].y;\n"
-    "MUL R3.xyz, R2, R0.w;\n"
-    "MUL R2.xyz, R0, c[10].x;\n"
-    "MAD R2.xyz, R2, R1.w, R3;\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "MUL R0.xyz, R0, c[9].y;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R2.xyz, R0, R2.w, R2;\n"
-    "MUL R0.xyz, R1, c[9].z;\n"
-    "ADD R2.w, -R0, c[8].x;\n"
-    "MAD R2.xyz, R0, R2.w, R2;\n"
-    "ADD R0.y, -R1.w, c[8].x;\n"
-    "MUL R0.z, R1.w, R2.w;\n"
-    "MUL R0.x, R0.w, R1.w;\n"
-    "MUL R0.y, R0.w, R0;\n"
-    "DP3 R2.w, R0, c[9];\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.zw, R0.xyxy, c[0].xyxy;\n"
+    "ADD R1.x, R0.z, R0.w;\n"
+    "MUL R0.xy, fragment.position, c[7];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1.x, R1, c[0].z;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R2.xyz, R0, c[4].y;\n"
+    "MUL R3.xyz, R1.w, R2;\n"
+    "MUL R2.xyz, R1, c[4].x;\n"
+    "MAD R2.xyz, R0.w, R2, R3;\n"
+    "ADD R3.xy, fragment.position, c[8];\n"
+    "ADD R2.w, -R0, c[10].x;\n"
+    "MUL R1.xyz, R1, c[5].y;\n"
+    "MAD R2.xyz, R2.w, R1, R2;\n"
+    "MUL R1.xyz, R0, c[5].z;\n"
+    "ADD R3.z, -R1.w, c[10].x;\n"
+    "MAD R2.xyz, R3.z, R1, R2;\n"
+    "MUL R1.y, R1.w, R2.w;\n"
+    "MUL R1.x, R1.w, R0.w;\n"
+    "MUL R1.z, R0.w, R3;\n"
+    "DP3 R2.w, R1, c[5];\n"
+    "MUL R3.xy, R3, c[6];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[9];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -4076,30 +3975,30 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R0.x, R0, c[6].z;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R2.x, -R1.w, c[8];\n"
-    "MUL R2.xyz, R0, R2.x;\n"
-    "MAD R0.xyz, R0, R1, R2;\n"
+    "MUL R0.zw, R0.xyxy, c[0].xyxy;\n"
+    "ADD R1.x, R0.z, R0.w;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1.x, R1, c[0].z;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
     "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R2.xyz, R1, R2.x;\n"
+    "MAD R1.xyz, R1, R0, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -4110,25 +4009,25 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[6].z;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R2, R0, R1;\n"
-    "MAD R2, -R0, R1, R2;\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.z, R0.x, c[0];\n"
+    "ADD R3.xy, fragment.position, c[6];\n"
+    "TEX R1, R0.z, texture[2], 1D;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "ADD R2, R1, R0;\n"
+    "MAD R2, -R1, R0, R2;\n"
+    "MUL R3.xy, R3, c[4];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -4141,16 +4040,16 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[6].z;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
     "ADD R2.w, -R1, c[8].y;\n"
     "ADD R3.xyz, R0.w, -R0;\n"
@@ -4171,11 +4070,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "MAD R2.xyz, R2, R0, R3;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -4188,32 +4087,32 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[6].z;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "ADD R0.z, R0.x, R0.y;\n"
+    "MUL R1.x, R0.z, c[0].z;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MIN R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[8].x;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -4225,64 +4124,64 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[6].z;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "ADD R0.z, R0.x, R0.y;\n"
+    "MUL R1.x, R0.z, c[0].z;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MAX R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[8].x;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_COLORDODGE =
     "!!ARBfp1.0\n"
     "PARAM c[9] = { program.local[0..7],\n"
-    "		{ 1, 1e-06 } };\n"
+    "		{ 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[6].z;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[2], 1D;\n"
     "MAX R1.x, R0.w, c[8].y;\n"
     "RCP R1.x, R1.x;\n"
     "MAD R2.xyz, -R0, R1.x, c[8].x;\n"
     "MAX R2.xyz, R2, c[8].y;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
     "ADD R2.w, -R0, c[8].x;\n"
     "MUL R3.xyz, R1, R2.w;\n"
     "ADD R2.w, -R1, c[8].x;\n"
     "MAD R4.xyz, R0, R2.w, R3;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MUL R2.w, R0, R1;\n"
     "MAD R0.xyz, R0, R1.w, R3;\n"
     "SGE R0.xyz, R0, R2.w;\n"
@@ -4295,11 +4194,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "MAD R2.xyz, R0, R4, R2;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -4307,25 +4206,25 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_COLORBURN =
     "!!ARBfp1.0\n"
     "PARAM c[9] = { program.local[0..7],\n"
-    "		{ 1, 9.9999997e-06 } };\n"
+    "		{ 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[6].z;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "MAD R2.xyz, -R0.w, R1.w, R3;\n"
     "MUL R4.xyz, R0.w, R2;\n"
@@ -4340,18 +4239,17 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "MUL R4.xyz, R1, R3.w;\n"
     "MAD R0.xyz, R0, R2.w, R4;\n"
     "MUL R2.w, R0, R1;\n"
-    "ADD R3.w, -R0, c[8].x;\n"
     "MAD R2.xyz, R1, R3.w, R2;\n"
     "ADD R2.xyz, R2, -R0;\n"
     "SGE R3.xyz, R3, R2.w;\n"
     "MAD R2.xyz, R3, R2, R0;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -4365,16 +4263,16 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[6].z;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
     "ADD R2.w, -R1, c[8].y;\n"
     "ADD R3.xyz, R0.w, -R0;\n"
@@ -4395,11 +4293,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "MAD R2.xyz, R0, R2, R3;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -4407,8 +4305,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
     "PARAM c[10] = { program.local[0..7],\n"
-    "		{ 1, 9.9999997e-06, 2, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 9.9999997e-006, 2, 3 },\n"
+    "		{ 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -4416,60 +4314,58 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R2.xyz, fragment.position.y, c[4];\n"
-    "MAD R3.xyz, fragment.position.x, c[3], R2;\n"
-    "MUL R0.xy, fragment.position, c[7];\n"
-    "TEX R1, R0, texture[0], 2D;\n"
-    "MAX R0.x, R1.w, c[8].y;\n"
-    "RCP R2.w, R0.x;\n"
-    "MUL R0.xyz, R1, R2.w;\n"
-    "RSQ R0.w, R0.x;\n"
-    "RSQ R2.y, R0.y;\n"
-    "ADD R3.xyz, R3, c[5];\n"
-    "RCP R2.x, R0.w;\n"
-    "RCP R0.w, R3.z;\n"
-    "MUL R3.xy, R3, R0.w;\n"
-    "RSQ R0.w, R0.z;\n"
-    "RCP R2.z, R0.w;\n"
+    "MUL R2.xyz, fragment.position.y, c[2];\n"
+    "MAD R3.xyz, fragment.position.x, c[1], R2;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MAX R1.x, R0.w, c[8].y;\n"
+    "RCP R2.w, R1.x;\n"
+    "MUL R1.xyz, R0, R2.w;\n"
+    "RSQ R1.w, R1.x;\n"
+    "RSQ R2.y, R1.y;\n"
+    "ADD R3.xyz, R3, c[3];\n"
+    "RCP R2.x, R1.w;\n"
+    "RCP R1.w, R3.z;\n"
+    "MUL R3.xy, R3, R1.w;\n"
+    "RSQ R1.w, R1.z;\n"
+    "RCP R2.z, R1.w;\n"
     "RCP R2.y, R2.y;\n"
-    "MAD R6.xyz, R2, R1.w, -R1;\n"
-    "MUL R2.xyz, -R0, c[8].w;\n"
-    "ADD R5.xyz, R2, c[9].x;\n"
-    "MAD R2.xyz, -R1, R2.w, c[8].x;\n"
-    "MUL R3.xy, R3, c[6];\n"
-    "ADD R0.w, R3.x, R3.y;\n"
-    "MUL R0.w, R0, c[6].z;\n"
-    "TEX R0, R0.w, texture[2], 1D;\n"
-    "MAD R3.xyz, R0, c[8].z, -R0.w;\n"
+    "MAD R6.xyz, R0.w, R2, -R0;\n"
+    "MUL R2.xyz, -R1, c[9].x;\n"
+    "ADD R5.xyz, R2, c[8].w;\n"
+    "MAD R2.xyz, -R0, R2.w, c[8].x;\n"
+    "MUL R3.xy, R3, c[0];\n"
+    "ADD R1.w, R3.x, R3.y;\n"
+    "MUL R1.w, R1, c[0].z;\n"
+    "TEX R1, R1.w, texture[2], 1D;\n"
+    "MAD R3.xyz, R1, c[8].z, -R1.w;\n"
     "MUL R4.xyz, R2, R3;\n"
-    "MAD R4.xyz, -R4, R5, R0.w;\n"
+    "MAD R4.xyz, -R4, R5, R1.w;\n"
+    "MAD R2.xyz, -R2, R3, R1.w;\n"
     "MUL R5.xyz, R6, R3;\n"
-    "MAD R2.xyz, -R2, R3, R0.w;\n"
-    "MAD R6.xyz, R1, R0.w, R5;\n"
-    "MUL R4.xyz, R1, R4;\n"
-    "MUL R5.xyz, R1, c[8].w;\n"
-    "ADD R6.xyz, R6, -R4;\n"
-    "SGE R5.xyz, R5, R1.w;\n"
-    "MUL R5.xyz, R5, R6;\n"
-    "ADD R3.xyz, R4, R5;\n"
-    "MUL R2.xyz, R1, R2;\n"
-    "MUL R4.xyz, R0, c[8].z;\n"
+    "MUL R4.xyz, R0, R4;\n"
+    "MAD R5.xyz, R1.w, R0, R5;\n"
+    "ADD R6.xyz, R5, -R4;\n"
+    "MUL R5.xyz, R0, c[9].x;\n"
+    "SGE R3.xyz, R5, R0.w;\n"
+    "MAD R3.xyz, R3, R6, R4;\n"
+    "MUL R2.xyz, R0, R2;\n"
+    "MUL R4.xyz, R1, c[8].z;\n"
+    "SGE R4.xyz, R4, R1.w;\n"
     "ADD R3.xyz, R3, -R2;\n"
-    "SGE R4.xyz, R4, R0.w;\n"
-    "MUL R3.xyz, R4, R3;\n"
-    "ADD R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MAD R2.xyz, R4, R3, R2;\n"
+    "ADD R2.w, -R0, c[8].x;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -4481,106 +4377,104 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R0.x, R0, c[6].z;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "ADD R3.xyz, R0, R1;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MUL R0.xyz, R0, R1.w;\n"
-    "MIN R0.xyz, R0, R2;\n"
-    "MAD R2.xyz, -R0, c[8].x, R3;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "ADD R0.z, R0.x, R0.y;\n"
+    "MUL R1.x, R0.z, c[0].z;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "ADD R2.xyz, R1, R0;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R1.xyz, R1, R0.w;\n"
+    "MIN R1.xyz, R1, R3;\n"
+    "MAD R2.xyz, -R1, c[8].x, R2;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_EXCLUSION =
     "!!ARBfp1.0\n"
     "PARAM c[9] = { program.local[0..7],\n"
-    "		{ 1, 2 } };\n"
+    "		{ 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[6].z;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "TEX R0, R0, texture[2], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MAD R3.xyz, R0, R1.w, R2;\n"
-    "MUL R2.xyz, R0, R1;\n"
-    "MAD R2.xyz, -R2, c[8].y, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "ADD R0.z, R0.x, R0.y;\n"
+    "MUL R1.x, R0.z, c[0].z;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 1D;\n"
+    "MUL R2.xyz, R1.w, R0;\n"
+    "MAD R3.xyz, R1, R0.w, R2;\n"
+    "MUL R2.xyz, R1, R0;\n"
+    "MAD R2.xyz, -R2, c[8].x, R3;\n"
+    "ADD R2.w, -R0, c[8].y;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8].y;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_SIMPLE_PORTER_DUFF_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..4],\n"
-    "		{ 1 },\n"
-    "		program.local[6..7] };\n"
+    "PARAM c[8] = { program.local[0..6],\n"
+    "		{ 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[6].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, c[7].y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
+    "MUL R2.xyz, R1, c[4].y;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MUL R3.xyz, R2, R0.w;\n"
-    "MUL R2.xyz, R0, c[7].x;\n"
-    "MAD R2.xyz, R2, R1.w, R3;\n"
-    "MUL R0.xyz, R0, c[6].y;\n"
-    "ADD R2.w, -R1, c[5].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[5];\n"
-    "MUL R1.xyz, R1, c[6].z;\n"
-    "MAD result.color.xyz, R1, R2.x, R0;\n"
-    "ADD R0.y, -R1.w, c[5].x;\n"
+    "MUL R3.xyz, R0.w, R2;\n"
+    "MUL R2.xyz, R0, c[4].x;\n"
+    "MAD R2.xyz, R1.w, R2, R3;\n"
+    "ADD R2.w, -R1, c[7].x;\n"
+    "MUL R0.xyz, R0, c[5].y;\n"
+    "MAD R0.xyz, R2.w, R0, R2;\n"
+    "ADD R2.x, -R0.w, c[7];\n"
+    "MUL R1.xyz, R1, c[5].z;\n"
+    "MAD result.color.xyz, R2.x, R1, R0;\n"
     "MUL R0.x, R0.w, R1.w;\n"
     "MUL R0.z, R1.w, R2.x;\n"
-    "MUL R0.y, R0.w, R0;\n"
-    "DP3 result.color.w, R0, c[6];\n"
+    "MUL R0.y, R0.w, R2.w;\n"
+    "DP3 result.color.w, R0, c[5];\n"
     "END\n"
     ;
 
@@ -4591,16 +4485,16 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
     "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R0.x, R0, c[3].z;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "ADD R2.x, -R1.w, c[5];\n"
     "MUL R2.xyz, R0, R2.x;\n"
@@ -4618,16 +4512,16 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
     "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R0.x, R0, c[3].z;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "ADD R2, R0, R1;\n"
     "MAD result.color, -R0, R1, R2;\n"
@@ -4642,14 +4536,14 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R1.xy, fragment.position, c[4];\n"
     "TEX R1, R1, texture[0], 2D;\n"
@@ -4683,19 +4577,19 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MIN R2.xyz, R2, R3;\n"
     "ADD R2.w, -R1, c[5].x;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
@@ -4714,19 +4608,19 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MAX R2.xyz, R2, R3;\n"
     "ADD R2.w, -R1, c[5].x;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
@@ -4740,19 +4634,19 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_COLORDODGE_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..4],\n"
-    "		{ 1, 1e-06 } };\n"
+    "		{ 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MAX R1.x, R0.w, c[5].y;\n"
     "RCP R1.x, R1.x;\n"
@@ -4764,7 +4658,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "MUL R2.xyz, R1, R2.x;\n"
     "ADD R2.w, -R1, c[5].x;\n"
     "MAD R2.xyz, R0, R2.w, R2;\n"
-    "MUL R1.xyz, R1, R0.w;\n"
+    "MUL R1.xyz, R0.w, R1;\n"
     "MAD R0.xyz, R0, R1.w, R1;\n"
     "MUL R2.w, R0, R1;\n"
     "RCP R3.x, R3.x;\n"
@@ -4783,25 +4677,25 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_COLORBURN_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..4],\n"
-    "		{ 1, 9.9999997e-06 } };\n"
+    "		{ 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "ADD R2.w, -R1, c[5].x;\n"
     "MAD R2.xyz, -R0.w, R1.w, R3;\n"
@@ -4814,9 +4708,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "RCP R2.z, R2.z;\n"
     "MAD R2.xyz, R4, R2, R5;\n"
     "MUL R4.xyz, R1, R3.w;\n"
-    "MAD R0.xyz, R0, R2.w, R4;\n"
-    "ADD R3.w, -R0, c[5].x;\n"
     "MAD R1.xyz, R1, R3.w, R2;\n"
+    "MAD R0.xyz, R0, R2.w, R4;\n"
     "MUL R2.x, R0.w, R1.w;\n"
     "ADD R2.w, R0, R1;\n"
     "ADD R1.xyz, R1, -R0;\n"
@@ -4835,14 +4728,14 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
     "MUL R1.xy, fragment.position, c[4];\n"
     "TEX R1, R1, texture[0], 2D;\n"
@@ -4871,8 +4764,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[7] = { program.local[0..4],\n"
-    "		{ 1, 9.9999997e-06, 2, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 9.9999997e-006, 2, 3 },\n"
+    "		{ 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -4880,8 +4773,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R2.xyz, fragment.position.y, c[1];\n"
-    "MAD R3.xyz, fragment.position.x, c[0], R2;\n"
+    "MUL R2.xyz, fragment.position.y, c[2];\n"
+    "MAD R3.xyz, fragment.position.x, c[1], R2;\n"
     "MUL R0.xy, fragment.position, c[4];\n"
     "TEX R1, R0, texture[0], 2D;\n"
     "MAX R0.x, R1.w, c[5].y;\n"
@@ -4889,39 +4782,37 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "MUL R0.xyz, R1, R2.w;\n"
     "RSQ R0.w, R0.x;\n"
     "RSQ R2.y, R0.y;\n"
-    "ADD R3.xyz, R3, c[2];\n"
+    "ADD R3.xyz, R3, c[3];\n"
     "RCP R2.x, R0.w;\n"
     "RCP R0.w, R3.z;\n"
     "MUL R3.xy, R3, R0.w;\n"
     "RSQ R0.w, R0.z;\n"
     "RCP R2.z, R0.w;\n"
     "RCP R2.y, R2.y;\n"
-    "MAD R6.xyz, R2, R1.w, -R1;\n"
-    "MUL R2.xyz, -R0, c[5].w;\n"
-    "ADD R5.xyz, R2, c[6].x;\n"
+    "MAD R6.xyz, R1.w, R2, -R1;\n"
+    "MUL R2.xyz, -R0, c[6].x;\n"
+    "ADD R5.xyz, R2, c[5].w;\n"
     "MAD R2.xyz, -R1, R2.w, c[5].x;\n"
-    "MUL R3.xy, R3, c[3];\n"
+    "MUL R3.xy, R3, c[0];\n"
     "ADD R0.w, R3.x, R3.y;\n"
-    "MUL R0.w, R0, c[3].z;\n"
+    "MUL R0.w, R0, c[0].z;\n"
     "TEX R0, R0.w, texture[1], 1D;\n"
     "MAD R3.xyz, R0, c[5].z, -R0.w;\n"
     "MUL R4.xyz, R2, R3;\n"
     "MAD R4.xyz, -R4, R5, R0.w;\n"
     "MUL R5.xyz, R6, R3;\n"
     "MAD R2.xyz, -R2, R3, R0.w;\n"
-    "MAD R6.xyz, R1, R0.w, R5;\n"
     "MUL R4.xyz, R1, R4;\n"
-    "MUL R5.xyz, R1, c[5].w;\n"
-    "ADD R6.xyz, R6, -R4;\n"
-    "SGE R5.xyz, R5, R1.w;\n"
-    "MUL R5.xyz, R5, R6;\n"
-    "ADD R3.xyz, R4, R5;\n"
+    "MAD R5.xyz, R0.w, R1, R5;\n"
+    "ADD R6.xyz, R5, -R4;\n"
+    "MUL R5.xyz, R1, c[6].x;\n"
+    "SGE R3.xyz, R5, R1.w;\n"
+    "MAD R3.xyz, R3, R6, R4;\n"
     "MUL R2.xyz, R1, R2;\n"
     "MUL R4.xyz, R0, c[5].z;\n"
     "ADD R3.xyz, R3, -R2;\n"
     "SGE R4.xyz, R4, R0.w;\n"
-    "MUL R3.xyz, R4, R3;\n"
-    "ADD R2.xyz, R2, R3;\n"
+    "MAD R2.xyz, R4, R3, R2;\n"
     "ADD R2.w, -R1, c[5].x;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
@@ -4939,19 +4830,19 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "TEX R1, R1, texture[0], 2D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "ADD R0.xyz, R0, R1;\n"
     "MIN R2.xyz, R2, R3;\n"
     "ADD R1.x, R0.w, R1.w;\n"
@@ -4963,30 +4854,30 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MODES_EXCLUSION_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..4],\n"
-    "		{ 1, 2 } };\n"
+    "		{ 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX R0, R0, texture[1], 1D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "MUL R2.xyz, R0, R1;\n"
-    "MAD R2.xyz, -R2, c[5].y, R3;\n"
-    "ADD R2.w, -R1, c[5].x;\n"
+    "MAD R2.xyz, -R2, c[5].x, R3;\n"
+    "ADD R2.w, -R1, c[5].y;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[5].x;\n"
+    "ADD R2.y, -R0.w, c[5];\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -4997,18 +4888,18 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "PARAM c[7] = { program.local[0..6] };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.z;\n"
-    "MUL R0.zw, R0, c[3].xyxy;\n"
+    "MUL R0.zw, R0, c[0].xyxy;\n"
     "ADD R1.x, R0.z, R0.w;\n"
-    "ADD R0.xy, fragment.position, c[4];\n"
-    "MUL R0.xy, R0, c[5];\n"
+    "ADD R0.xy, fragment.position, c[5];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "DP4 R1.y, R0, c[6];\n"
-    "MUL R1.x, R1, c[3].z;\n"
+    "MUL R1.x, R1, c[0].z;\n"
     "TEX R0, R1, texture[1], 1D;\n"
     "MUL result.color, R0, R1.y;\n"
     "END\n"
@@ -5018,58 +4909,55 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_LINEAR_COMPOSITION_MOD
     "!!ARBfp1.0\n"
     "PARAM c[4] = { program.local[0..3] };\n"
     "TEMP R0;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "ADD R0.x, R0, R0.y;\n"
-    "MUL R0.x, R0, c[3].z;\n"
+    "MUL R0.x, R0, c[0].z;\n"
     "TEX result.color, R0, texture[0], 1D;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_SIMPLE_PORTER_DUFF =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..7],\n"
-    "		{ 1 },\n"
-    "		program.local[9..10] };\n"
+    "PARAM c[11] = { program.local[0..9],\n"
+    "		{ 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
-    "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R0, R0, texture[2], 2D;\n"
-    "MUL R2.xyz, R1, c[10].y;\n"
-    "MUL R3.xyz, R2, R0.w;\n"
-    "MUL R2.xyz, R0, c[10].x;\n"
-    "MAD R2.xyz, R2, R1.w, R3;\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "MUL R0.xyz, R0, c[9].y;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R2.xyz, R0, R2.w, R2;\n"
-    "ADD R2.w, -R0, c[8].x;\n"
-    "MUL R0.xyz, R1, c[9].z;\n"
-    "MAD R2.xyz, R0, R2.w, R2;\n"
-    "ADD R0.y, -R1.w, c[8].x;\n"
-    "MUL R0.z, R1.w, R2.w;\n"
-    "MUL R0.x, R0.w, R1.w;\n"
-    "MUL R0.y, R0.w, R0;\n"
-    "DP3 R2.w, R0, c[9];\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R1.xyz, R0, c[3];\n"
+    "RCP R0.z, R1.z;\n"
+    "MUL R1.xy, R1, R0.z;\n"
+    "MUL R0.xy, fragment.position, c[7];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1.xy, R1, c[0];\n"
+    "TEX R1, R1, texture[2], 2D;\n"
+    "MUL R2.xyz, R0, c[4].y;\n"
+    "MUL R3.xyz, R1.w, R2;\n"
+    "MUL R2.xyz, R1, c[4].x;\n"
+    "MAD R2.xyz, R0.w, R2, R3;\n"
+    "ADD R3.xy, fragment.position, c[8];\n"
+    "ADD R2.w, -R0, c[10].x;\n"
+    "MUL R1.xyz, R1, c[5].y;\n"
+    "MAD R2.xyz, R2.w, R1, R2;\n"
+    "MUL R1.xyz, R0, c[5].z;\n"
+    "ADD R3.z, -R1.w, c[10].x;\n"
+    "MAD R2.xyz, R3.z, R1, R2;\n"
+    "MUL R1.y, R1.w, R2.w;\n"
+    "MUL R1.x, R1.w, R0.w;\n"
+    "MUL R1.z, R0.w, R3;\n"
+    "DP3 R2.w, R1, c[5];\n"
+    "MUL R3.xy, R3, c[6];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[9];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -5080,29 +4968,28 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
-    "RCP R1.x, R0.z;\n"
-    "MUL R0.xy, R0, R1.x;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R0, R0, texture[2], 2D;\n"
-    "ADD R2.x, -R1.w, c[8];\n"
-    "MUL R2.xyz, R0, R2.x;\n"
-    "MAD R0.xyz, R0, R1, R2;\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R1.xyz, R0, c[3];\n"
+    "RCP R0.z, R1.z;\n"
+    "MUL R1.xy, R1, R0.z;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1.xy, R1, c[0];\n"
+    "TEX R1, R1, texture[2], 2D;\n"
     "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R2.xyz, R1, R2.x;\n"
+    "MAD R1.xyz, R1, R0, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -5113,24 +5000,23 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "TEX R0, R0, texture[2], 2D;\n"
-    "ADD R2, R0, R1;\n"
-    "MAD R2, -R0, R1, R2;\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.zw, R0.xyxy, c[0].xyxy;\n"
+    "ADD R3.xy, fragment.position, c[6];\n"
+    "TEX R1, R0.zwzw, texture[2], 2D;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "ADD R2, R1, R0;\n"
+    "MAD R2, -R1, R0, R2;\n"
+    "MUL R3.xy, R3, c[4];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -5143,15 +5029,14 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[2], 2D;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
     "ADD R2.w, -R1, c[8].y;\n"
     "ADD R3.xyz, R0.w, -R0;\n"
@@ -5172,11 +5057,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "MAD R2.xyz, R2, R0, R3;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -5189,31 +5074,30 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "TEX R0, R0, texture[2], 2D;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R0.zw, R0.xyxy, R0.z;\n"
+    "MUL R1.xy, R0.zwzw, c[0];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 2D;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MIN R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[8].x;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -5225,62 +5109,60 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "TEX R0, R0, texture[2], 2D;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R0.zw, R0.xyxy, R0.z;\n"
+    "MUL R1.xy, R0.zwzw, c[0];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 2D;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MAX R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[8].x;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_COLORDODGE =
     "!!ARBfp1.0\n"
     "PARAM c[9] = { program.local[0..7],\n"
-    "		{ 1, 1e-06 } };\n"
+    "		{ 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[2], 2D;\n"
     "MAX R1.x, R0.w, c[8].y;\n"
     "RCP R1.x, R1.x;\n"
-    "MAD R1.xyz, -R0, R1.x, c[8].x;\n"
-    "MAX R2.xyz, R1, c[8].y;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
+    "MAD R2.xyz, -R0, R1.x, c[8].x;\n"
+    "MAX R2.xyz, R2, c[8].y;\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
     "ADD R2.w, -R0, c[8].x;\n"
     "MUL R3.xyz, R1, R2.w;\n"
     "ADD R2.w, -R1, c[8].x;\n"
     "MAD R4.xyz, R0, R2.w, R3;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MUL R2.w, R0, R1;\n"
     "MAD R0.xyz, R0, R1.w, R3;\n"
     "SGE R0.xyz, R0, R2.w;\n"
@@ -5293,11 +5175,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "MAD R2.xyz, R0, R4, R2;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -5305,24 +5187,23 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_COLORBURN =
     "!!ARBfp1.0\n"
     "PARAM c[9] = { program.local[0..7],\n"
-    "		{ 1, 9.9999997e-06 } };\n"
+    "		{ 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[5].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[2], 2D;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "MAD R2.xyz, -R0.w, R1.w, R3;\n"
     "MUL R4.xyz, R0.w, R2;\n"
@@ -5337,18 +5218,17 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "MUL R4.xyz, R1, R3.w;\n"
     "MAD R0.xyz, R0, R2.w, R4;\n"
     "MUL R2.w, R0, R1;\n"
-    "ADD R3.w, -R0, c[8].x;\n"
     "MAD R2.xyz, R1, R3.w, R2;\n"
     "ADD R2.xyz, R2, -R0;\n"
     "SGE R3.xyz, R3, R2.w;\n"
     "MAD R2.xyz, R3, R2, R0;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -5362,15 +5242,14 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[2], 2D;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
+    "MUL R1.xy, fragment.position, c[5];\n"
     "TEX R1, R1, texture[0], 2D;\n"
     "ADD R2.w, -R1, c[8].y;\n"
     "ADD R3.xyz, R0.w, -R0;\n"
@@ -5391,11 +5270,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "MAD R2.xyz, R0, R2, R3;\n"
     "ADD R0.z, R0.w, R1.w;\n"
     "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
+    "ADD R0.xy, fragment.position, c[6];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
+    "DP4 R0.x, R0, c[7];\n"
     "MAD result.color, R0.x, R2, R1;\n"
     "END\n"
     ;
@@ -5403,8 +5282,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
     "PARAM c[10] = { program.local[0..7],\n"
-    "		{ 1, 9.9999997e-06, 2, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 9.9999997e-006, 2, 3 },\n"
+    "		{ 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -5412,59 +5291,56 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
-    "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MAX R0.z, R1.w, c[8].y;\n"
-    "RCP R2.w, R0.z;\n"
-    "MUL R2.xyz, R1, R2.w;\n"
-    "MUL R6.xyz, -R2, c[8].w;\n"
-    "MAD R3.xyz, -R1, R2.w, c[8].x;\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R0, R0, texture[2], 2D;\n"
-    "MAD R4.xyz, R0, c[8].z, -R0.w;\n"
-    "MUL R5.xyz, R3, R4;\n"
-    "MAD R3.xyz, -R3, R4, R0.w;\n"
-    "ADD R6.xyz, R6, c[9].x;\n"
-    "RSQ R2.x, R2.x;\n"
-    "RSQ R2.z, R2.z;\n"
-    "RSQ R2.y, R2.y;\n"
-    "MAD R5.xyz, -R5, R6, R0.w;\n"
-    "MUL R3.xyz, R1, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "RCP R2.x, R2.x;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MAX R1.x, R0.w, c[8].y;\n"
+    "RCP R2.w, R1.x;\n"
+    "MUL R1.xyz, R0, R2.w;\n"
+    "RSQ R1.w, R1.x;\n"
+    "RCP R2.x, R1.w;\n"
+    "RSQ R1.w, R1.y;\n"
+    "RSQ R2.z, R1.z;\n"
+    "MUL R3.xyz, fragment.position.y, c[2];\n"
+    "MAD R3.xyz, fragment.position.x, c[1], R3;\n"
+    "ADD R3.xyz, R3, c[3];\n"
+    "RCP R2.y, R1.w;\n"
+    "RCP R1.w, R3.z;\n"
+    "MUL R3.xy, R3, R1.w;\n"
     "RCP R2.z, R2.z;\n"
-    "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R2, R1.w, -R1;\n"
-    "MUL R6.xyz, R2, R4;\n"
-    "MUL R2.xyz, R1, R5;\n"
-    "MAD R6.xyz, R1, R0.w, R6;\n"
-    "MUL R4.xyz, R0, c[8].z;\n"
-    "MUL R5.xyz, R1, c[8].w;\n"
-    "ADD R6.xyz, R6, -R2;\n"
-    "SGE R5.xyz, R5, R1.w;\n"
-    "MUL R5.xyz, R5, R6;\n"
-    "ADD R2.xyz, R2, R5;\n"
-    "SGE R4.xyz, R4, R0.w;\n"
-    "ADD R2.xyz, R2, -R3;\n"
-    "MUL R2.xyz, R4, R2;\n"
-    "ADD R2.xyz, R3, R2;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MAD R6.xyz, R0.w, R2, -R0;\n"
+    "MUL R2.xyz, -R1, c[9].x;\n"
+    "ADD R5.xyz, R2, c[8].w;\n"
+    "MAD R2.xyz, -R0, R2.w, c[8].x;\n"
+    "MUL R3.xy, R3, c[0];\n"
+    "TEX R1, R3, texture[2], 2D;\n"
+    "MAD R3.xyz, R1, c[8].z, -R1.w;\n"
+    "MUL R4.xyz, R2, R3;\n"
+    "MAD R4.xyz, -R4, R5, R1.w;\n"
+    "MAD R2.xyz, -R2, R3, R1.w;\n"
+    "MUL R5.xyz, R6, R3;\n"
+    "MUL R4.xyz, R0, R4;\n"
+    "MAD R5.xyz, R1.w, R0, R5;\n"
+    "ADD R6.xyz, R5, -R4;\n"
+    "MUL R5.xyz, R0, c[9].x;\n"
+    "SGE R3.xyz, R5, R0.w;\n"
+    "MAD R3.xyz, R3, R6, R4;\n"
+    "MUL R2.xyz, R0, R2;\n"
+    "MUL R4.xyz, R1, c[8].z;\n"
+    "SGE R4.xyz, R4, R1.w;\n"
+    "ADD R3.xyz, R3, -R2;\n"
+    "MAD R2.xyz, R4, R3, R2;\n"
+    "ADD R2.w, -R0, c[8].x;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -5476,103 +5352,98 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R0, R0, texture[2], 2D;\n"
-    "ADD R3.xyz, R0, R1;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MUL R0.xyz, R0, R1.w;\n"
-    "MIN R0.xyz, R0, R2;\n"
-    "MAD R2.xyz, -R0, c[8].x, R3;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.zw, R0.xyxy, R0.z;\n"
+    "MUL R1.xy, R0.zwzw, c[0];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 2D;\n"
+    "ADD R2.xyz, R1, R0;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R1.xyz, R1, R0.w;\n"
+    "MIN R1.xyz, R1, R3;\n"
+    "MAD R2.xyz, -R1, c[8].x, R2;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_EXCLUSION =
     "!!ARBfp1.0\n"
     "PARAM c[9] = { program.local[0..7],\n"
-    "		{ 1, 2 } };\n"
+    "		{ 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "TEX R0, R0, texture[2], 2D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MAD R3.xyz, R0, R1.w, R2;\n"
-    "MUL R2.xyz, R0, R1;\n"
-    "MAD R2.xyz, -R2, c[8].y, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.zw, R0.xyxy, R0.z;\n"
+    "MUL R1.xy, R0.zwzw, c[0];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1, R1, texture[2], 2D;\n"
+    "MUL R2.xyz, R1.w, R0;\n"
+    "MAD R3.xyz, R1, R0.w, R2;\n"
+    "MUL R2.xyz, R1, R0;\n"
+    "MAD R2.xyz, -R2, c[8].x, R3;\n"
+    "ADD R2.w, -R0, c[8].y;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8].y;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_SIMPLE_PORTER_DUFF_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..4],\n"
-    "		{ 1 },\n"
-    "		program.local[6..7] };\n"
+    "PARAM c[8] = { program.local[0..6],\n"
+    "		{ 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
-    "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
+    "RCP R1.x, R0.z;\n"
+    "MUL R0.xy, R0, R1.x;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[6].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, c[7].y;\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R2.xyz, R1, c[4].y;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
-    "MUL R3.xyz, R2, R0.w;\n"
-    "MUL R2.xyz, R0, c[7].x;\n"
-    "MAD R2.xyz, R2, R1.w, R3;\n"
-    "MUL R0.xyz, R0, c[6].y;\n"
-    "ADD R2.w, -R1, c[5].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[5];\n"
-    "MUL R1.xyz, R1, c[6].z;\n"
-    "MAD result.color.xyz, R1, R2.x, R0;\n"
-    "ADD R0.y, -R1.w, c[5].x;\n"
+    "MUL R3.xyz, R0.w, R2;\n"
+    "MUL R2.xyz, R0, c[4].x;\n"
+    "MAD R2.xyz, R1.w, R2, R3;\n"
+    "ADD R2.w, -R1, c[7].x;\n"
+    "MUL R0.xyz, R0, c[5].y;\n"
+    "MAD R0.xyz, R2.w, R0, R2;\n"
+    "ADD R2.x, -R0.w, c[7];\n"
+    "MUL R1.xyz, R1, c[5].z;\n"
+    "MAD result.color.xyz, R2.x, R1, R0;\n"
     "MUL R0.x, R0.w, R1.w;\n"
     "MUL R0.z, R1.w, R2.x;\n"
-    "MUL R0.y, R0.w, R0;\n"
-    "DP3 result.color.w, R0, c[6];\n"
+    "MUL R0.y, R0.w, R2.w;\n"
+    "DP3 result.color.w, R0, c[5];\n"
     "END\n"
     ;
 
@@ -5583,15 +5454,14 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R1.x, R0.z;\n"
     "MUL R0.xy, R0, R1.x;\n"
-    "MUL R0.xy, R0, c[3];\n"
     "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2.x, -R1.w, c[5];\n"
     "MUL R2.xyz, R0, R2.x;\n"
@@ -5609,15 +5479,14 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
     "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
     "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "ADD R2, R0, R1;\n"
     "MAD result.color, -R0, R1, R2;\n"
@@ -5632,13 +5501,12 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "MUL R1.xy, fragment.position, c[4];\n"
     "TEX R1, R1, texture[0], 2D;\n"
@@ -5672,18 +5540,17 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MIN R2.xyz, R2, R3;\n"
     "ADD R2.w, -R1, c[5].x;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
@@ -5702,18 +5569,17 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "MAX R2.xyz, R2, R3;\n"
     "ADD R2.w, -R1, c[5].x;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
@@ -5727,41 +5593,40 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_COLORDODGE_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..4],\n"
-    "		{ 1, 1e-06 } };\n"
+    "		{ 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "MAX R1.x, R0.w, c[5].y;\n"
     "RCP R1.x, R1.x;\n"
-    "MAD R1.xyz, -R0, R1.x, c[5].x;\n"
-    "MAX R2.xyz, R1, c[5].y;\n"
+    "MAD R3.xyz, -R0, R1.x, c[5].x;\n"
+    "MAX R3.xyz, R3, c[5].y;\n"
     "MUL R1.xy, fragment.position, c[4];\n"
     "TEX R1, R1, texture[0], 2D;\n"
-    "ADD R2.w, -R0, c[5].x;\n"
-    "MUL R3.xyz, R1, R2.w;\n"
+    "ADD R2.x, -R0.w, c[5];\n"
+    "MUL R2.xyz, R1, R2.x;\n"
     "ADD R2.w, -R1, c[5].x;\n"
-    "MAD R3.xyz, R0, R2.w, R3;\n"
-    "MUL R1.xyz, R1, R0.w;\n"
+    "MAD R2.xyz, R0, R2.w, R2;\n"
+    "MUL R1.xyz, R0.w, R1;\n"
     "MAD R0.xyz, R0, R1.w, R1;\n"
     "MUL R2.w, R0, R1;\n"
-    "RCP R2.x, R2.x;\n"
-    "RCP R2.y, R2.y;\n"
-    "RCP R2.z, R2.z;\n"
-    "MAD R2.xyz, R1, R2, R3;\n"
-    "MAD R3.xyz, R0.w, R1.w, R3;\n"
+    "RCP R3.x, R3.x;\n"
+    "RCP R3.y, R3.y;\n"
+    "RCP R3.z, R3.z;\n"
+    "MAD R3.xyz, R1, R3, R2;\n"
+    "MAD R2.xyz, R0.w, R1.w, R2;\n"
     "ADD R1.x, R0.w, R1.w;\n"
-    "ADD R3.xyz, R3, -R2;\n"
+    "ADD R2.xyz, R2, -R3;\n"
     "SGE R0.xyz, R0, R2.w;\n"
-    "MAD result.color.xyz, R0, R3, R2;\n"
+    "MAD result.color.xyz, R0, R2, R3;\n"
     "MAD result.color.w, -R0, R1, R1.x;\n"
     "END\n"
     ;
@@ -5769,24 +5634,23 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_COLORBURN_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..4],\n"
-    "		{ 1, 9.9999997e-06 } };\n"
+    "		{ 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "ADD R2.w, -R1, c[5].x;\n"
     "MAD R2.xyz, -R0.w, R1.w, R3;\n"
@@ -5799,9 +5663,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "RCP R2.z, R2.z;\n"
     "MAD R2.xyz, R4, R2, R5;\n"
     "MUL R4.xyz, R1, R3.w;\n"
-    "MAD R0.xyz, R0, R2.w, R4;\n"
-    "ADD R3.w, -R0, c[5].x;\n"
     "MAD R1.xyz, R1, R3.w, R2;\n"
+    "MAD R0.xyz, R0, R2.w, R4;\n"
     "MUL R2.x, R0.w, R1.w;\n"
     "ADD R2.w, R0, R1;\n"
     "ADD R1.xyz, R1, -R0;\n"
@@ -5820,13 +5683,12 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
     "MUL R1.xy, fragment.position, c[4];\n"
     "TEX R1, R1, texture[0], 2D;\n"
@@ -5836,27 +5698,27 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "MUL R2.xyz, R2, R3;\n"
     "MUL R2.xyz, R2, c[5].x;\n"
     "MAD R2.xyz, R0.w, R1.w, -R2;\n"
+    "MAD R2.xyz, R0, R2.w, R2;\n"
     "MUL R4.xyz, R0, R2.w;\n"
     "MUL R3.xyz, R0, R1;\n"
-    "MAD R2.xyz, R0, R2.w, R2;\n"
-    "ADD R2.w, -R0, c[5].y;\n"
     "MUL R0.xyz, R0, c[5].x;\n"
-    "MAD R2.xyz, R1, R2.w, R2;\n"
+    "ADD R2.w, -R0, c[5].y;\n"
     "MAD R3.xyz, R3, c[5].x, R4;\n"
-    "MAD R1.xyz, R1, R2.w, R3;\n"
-    "ADD R2.w, R0, R1;\n"
-    "ADD R2.xyz, R2, -R1;\n"
+    "MAD R3.xyz, R1, R2.w, R3;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, R0.w, R1.w;\n"
+    "ADD R1.xyz, R1, -R3;\n"
     "SGE R0.xyz, R0, R0.w;\n"
-    "MAD result.color.xyz, R0, R2, R1;\n"
-    "MAD result.color.w, -R0, R1, R2;\n"
+    "MAD result.color.xyz, R0, R1, R3;\n"
+    "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[7] = { program.local[0..4],\n"
-    "		{ 1, 9.9999997e-06, 2, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 9.9999997e-006, 2, 3 },\n"
+    "		{ 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
@@ -5864,47 +5726,44 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R4;\n"
     "TEMP R5;\n"
     "TEMP R6;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
-    "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MAX R0.z, R1.w, c[5].y;\n"
-    "RCP R2.w, R0.z;\n"
-    "MUL R2.xyz, R1, R2.w;\n"
-    "MUL R6.xyz, -R2, c[5].w;\n"
-    "MAD R3.xyz, -R1, R2.w, c[5].x;\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "MAD R4.xyz, R0, c[5].z, -R0.w;\n"
-    "MUL R5.xyz, R3, R4;\n"
-    "MAD R3.xyz, -R3, R4, R0.w;\n"
-    "ADD R6.xyz, R6, c[6].x;\n"
-    "RSQ R2.x, R2.x;\n"
-    "RSQ R2.z, R2.z;\n"
-    "RSQ R2.y, R2.y;\n"
-    "MAD R5.xyz, -R5, R6, R0.w;\n"
-    "MUL R3.xyz, R1, R3;\n"
-    "RCP R2.x, R2.x;\n"
+    "MUL R0.xy, fragment.position, c[4];\n"
+    "TEX R1, R0, texture[0], 2D;\n"
+    "MAX R0.x, R1.w, c[5].y;\n"
+    "RCP R2.w, R0.x;\n"
+    "MUL R0.xyz, R1, R2.w;\n"
+    "RSQ R0.w, R0.x;\n"
+    "RCP R2.x, R0.w;\n"
+    "RSQ R0.w, R0.y;\n"
+    "RSQ R2.z, R0.z;\n"
+    "MUL R3.xyz, fragment.position.y, c[2];\n"
+    "MAD R3.xyz, fragment.position.x, c[1], R3;\n"
+    "ADD R3.xyz, R3, c[3];\n"
+    "RCP R2.y, R0.w;\n"
+    "RCP R0.w, R3.z;\n"
+    "MUL R3.xy, R3, R0.w;\n"
     "RCP R2.z, R2.z;\n"
-    "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R2, R1.w, -R1;\n"
-    "MUL R6.xyz, R2, R4;\n"
-    "MUL R2.xyz, R1, R5;\n"
+    "MAD R6.xyz, R1.w, R2, -R1;\n"
+    "MUL R2.xyz, -R0, c[6].x;\n"
+    "ADD R5.xyz, R2, c[5].w;\n"
+    "MAD R2.xyz, -R1, R2.w, c[5].x;\n"
+    "MUL R3.xy, R3, c[0];\n"
+    "TEX R0, R3, texture[1], 2D;\n"
+    "MAD R3.xyz, R0, c[5].z, -R0.w;\n"
+    "MUL R4.xyz, R2, R3;\n"
+    "MAD R4.xyz, -R4, R5, R0.w;\n"
+    "MUL R5.xyz, R6, R3;\n"
+    "MAD R2.xyz, -R2, R3, R0.w;\n"
+    "MUL R4.xyz, R1, R4;\n"
+    "MAD R5.xyz, R0.w, R1, R5;\n"
+    "ADD R6.xyz, R5, -R4;\n"
+    "MUL R5.xyz, R1, c[6].x;\n"
+    "SGE R3.xyz, R5, R1.w;\n"
+    "MAD R3.xyz, R3, R6, R4;\n"
+    "MUL R2.xyz, R1, R2;\n"
     "MUL R4.xyz, R0, c[5].z;\n"
-    "MAD R6.xyz, R1, R0.w, R6;\n"
-    "MUL R5.xyz, R1, c[5].w;\n"
-    "ADD R6.xyz, R6, -R2;\n"
-    "SGE R5.xyz, R5, R1.w;\n"
-    "MUL R5.xyz, R5, R6;\n"
-    "ADD R2.xyz, R2, R5;\n"
-    "ADD R2.xyz, R2, -R3;\n"
+    "ADD R3.xyz, R3, -R2;\n"
     "SGE R4.xyz, R4, R0.w;\n"
-    "MUL R2.xyz, R4, R2;\n"
-    "ADD R2.xyz, R3, R2;\n"
+    "MAD R2.xyz, R4, R3, R2;\n"
     "ADD R2.w, -R1, c[5].x;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
@@ -5922,18 +5781,17 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
-    "TEX R1, R1, texture[0], 2D;\n"
     "MUL R2.xyz, R0, R1.w;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
+    "MUL R3.xyz, R0.w, R1;\n"
     "ADD R0.xyz, R0, R1;\n"
     "MIN R2.xyz, R2, R3;\n"
     "ADD R1.x, R0.w, R1.w;\n"
@@ -5945,29 +5803,28 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MODES_EXCLUSION_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..4],\n"
-    "		{ 1, 2 } };\n"
+    "		{ 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R1.xy, fragment.position, c[4];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
+    "MUL R0.zw, fragment.position.xyxy, c[4].xyxy;\n"
+    "TEX R1, R0.zwzw, texture[0], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX R0, R0, texture[1], 2D;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
+    "MUL R2.xyz, R0.w, R1;\n"
     "MAD R3.xyz, R0, R1.w, R2;\n"
     "MUL R2.xyz, R0, R1;\n"
-    "MAD R2.xyz, -R2, c[5].y, R3;\n"
-    "ADD R2.w, -R1, c[5].x;\n"
+    "MAD R2.xyz, -R2, c[5].x, R3;\n"
+    "ADD R2.w, -R1, c[5].y;\n"
     "MAD R0.xyz, R0, R2.w, R2;\n"
     "ADD R2.x, R0.w, R1.w;\n"
-    "ADD R2.y, -R0.w, c[5].x;\n"
+    "ADD R2.y, -R0.w, c[5];\n"
     "MAD result.color.xyz, R1, R2.y, R0;\n"
     "MAD result.color.w, -R0, R1, R2.x;\n"
     "END\n"
@@ -5978,19 +5835,17 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "PARAM c[7] = { program.local[0..6] };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R1.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R1.xyz, R0, c[3];\n"
     "RCP R0.z, R1.z;\n"
     "MUL R1.xy, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[4];\n"
-    "MUL R0.xy, R0, c[5];\n"
+    "ADD R0.xy, fragment.position, c[5];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "DP4 R1.z, R0, c[6];\n"
-    "MUL R1.xy, R1, c[3];\n"
-    "MOV R0.x, R1;\n"
-    "MOV R0.y, -R1;\n"
-    "TEX R0, R0, texture[1], 2D;\n"
+    "MUL R1.xy, R1, c[0];\n"
+    "TEX R0, R1, texture[1], 2D;\n"
     "MUL result.color, R0, R1.z;\n"
     "END\n"
     ;
@@ -5999,58 +5854,55 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_TEXTURE_COMPOSITION_MO
     "!!ARBfp1.0\n"
     "PARAM c[4] = { program.local[0..3] };\n"
     "TEMP R0;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
+    "MUL R0.xy, R0, c[0];\n"
     "TEX result.color, R0, texture[0], 2D;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_SIMPLE_PORTER_DUFF =
     "!!ARBfp1.0\n"
-    "PARAM c[11] = { program.local[0..7],\n"
-    "		{ 1 },\n"
-    "		program.local[9..10] };\n"
+    "PARAM c[11] = { program.local[0..9],\n"
+    "		{ 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "TEX R0.x, R0, texture[2], 2D;\n"
-    "MUL R0, fragment.color.primary, R0.x;\n"
-    "MUL R2.xyz, R1, c[10].y;\n"
-    "MUL R3.xyz, R2, R0.w;\n"
-    "MUL R2.xyz, R0, c[10].x;\n"
-    "MAD R2.xyz, R2, R1.w, R3;\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
-    "MUL R0.xyz, R0, c[9].y;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R2.xyz, R0, R2.w, R2;\n"
-    "ADD R2.w, -R0, c[8].x;\n"
-    "MUL R0.xyz, R1, c[9].z;\n"
-    "MAD R2.xyz, R0, R2.w, R2;\n"
-    "ADD R0.y, -R1.w, c[8].x;\n"
-    "MUL R0.z, R1.w, R2.w;\n"
-    "MUL R0.x, R0.w, R1.w;\n"
-    "MUL R0.y, R0.w, R0;\n"
-    "DP3 R2.w, R0, c[9];\n"
-    "MUL R3.xy, R3, c[1];\n"
-    "TEX R0, R3, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.zw, R0.xyxy, R0.z;\n"
+    "MUL R1.xy, R0.zwzw, c[0];\n"
+    "MOV R1.y, -R1;\n"
+    "MUL R0.xy, fragment.position, c[7];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1.x, R1, texture[2], 2D;\n"
+    "MUL R1, fragment.color.primary, R1.x;\n"
+    "MUL R2.xyz, R0, c[4].y;\n"
+    "MUL R3.xyz, R1.w, R2;\n"
+    "MUL R2.xyz, R1, c[4].x;\n"
+    "MAD R2.xyz, R0.w, R2, R3;\n"
+    "ADD R3.xy, fragment.position, c[8];\n"
+    "ADD R2.w, -R0, c[10].x;\n"
+    "MUL R1.xyz, R1, c[5].y;\n"
+    "MAD R2.xyz, R2.w, R1, R2;\n"
+    "MUL R1.xyz, R0, c[5].z;\n"
+    "ADD R3.z, -R1.w, c[10].x;\n"
+    "MAD R2.xyz, R3.z, R1, R2;\n"
+    "MUL R1.y, R1.w, R2.w;\n"
+    "MUL R1.x, R1.w, R0.w;\n"
+    "MUL R1.z, R0.w, R3;\n"
+    "DP3 R2.w, R1, c[5];\n"
+    "MUL R3.xy, R3, c[6];\n"
+    "TEX R1, R3, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[9];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -6061,30 +5913,30 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R0.x, R0, texture[2], 2D;\n"
-    "MUL R0, fragment.color.primary, R0.x;\n"
-    "ADD R2.x, -R1.w, c[8];\n"
-    "MUL R2.xyz, R0, R2.x;\n"
-    "MAD R0.xyz, R0, R1, R2;\n"
+    "MUL R0.zw, R0.xyxy, R0.z;\n"
+    "MUL R1.xy, R0.zwzw, c[0];\n"
+    "MOV R1.y, -R1;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "TEX R1.x, R1, texture[2], 2D;\n"
+    "MUL R1, fragment.color.primary, R1.x;\n"
     "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R2.xyz, R1, R2.x;\n"
+    "MAD R1.xyz, R1, R0, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -6095,24 +5947,24 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "MOV R0.y, -R0;\n"
     "TEX R1.x, R0, texture[2], 2D;\n"
-    "MUL R0.xy, fragment.position, c[7];\n"
-    "ADD R3.xy, fragment.position, c[0];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "ADD R3.xy, fragment.position, c[6];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
     "ADD R2, R1, R0;\n"
     "MAD R2, -R1, R0, R2;\n"
-    "MUL R3.xy, R3, c[1];\n"
+    "MUL R3.xy, R3, c[4];\n"
     "TEX R1, R3, texture[1], 2D;\n"
     "ADD R2, R2, -R0;\n"
-    "DP4 R1.x, R1, c[2];\n"
+    "DP4 R1.x, R1, c[7];\n"
     "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
@@ -6126,16 +5978,16 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "MOV R0.y, -R0;\n"
     "TEX R1.x, R0, texture[2], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
-    "MUL R0.xy, fragment.position, c[7];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "ADD R2.w, -R0, c[8].y;\n"
     "ADD R3.xyz, R1.w, -R1;\n"
@@ -6156,11 +6008,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "MAD R2.xyz, R2, R1, R3;\n"
     "ADD R1.z, R1.w, R0.w;\n"
     "MAD R2.w, -R1, R0, R1.z;\n"
-    "ADD R1.xy, fragment.position, c[0];\n"
-    "MUL R1.xy, R1, c[1];\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
     "TEX R1, R1, texture[1], 2D;\n"
     "ADD R2, R2, -R0;\n"
-    "DP4 R1.x, R1, c[2];\n"
+    "DP4 R1.x, R1, c[7];\n"
     "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
@@ -6173,32 +6025,33 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R0.x, R0, texture[2], 2D;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MUL R0, fragment.color.primary, R0.x;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[2], 2D;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1, fragment.color.primary, R1.x;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MIN R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[8].x;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
@@ -6210,50 +6063,51 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R0.x, R0, texture[2], 2D;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MUL R0, fragment.color.primary, R0.x;\n"
-    "MUL R3.xyz, R1, R0.w;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[2], 2D;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1, fragment.color.primary, R1.x;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R2.xyz, R1, R0.w;\n"
     "MAX R2.xyz, R2, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "ADD R2.w, -R0, c[8].x;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8];\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_COLORDODGE =
     "!!ARBfp1.0\n"
     "PARAM c[9] = { program.local[0..7],\n"
-    "		{ 1, 1e-06 } };\n"
+    "		{ 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "MOV R0.y, -R0;\n"
     "TEX R0.x, R0, texture[2], 2D;\n"
     "MUL R1, fragment.color.primary, R0.x;\n"
@@ -6261,13 +6115,13 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "RCP R0.x, R0.x;\n"
     "MAD R0.xyz, -R1, R0.x, c[8].x;\n"
     "MAX R2.xyz, R0, c[8].y;\n"
-    "MUL R0.xy, fragment.position, c[7];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "ADD R2.w, -R1, c[8].x;\n"
     "MUL R3.xyz, R0, R2.w;\n"
     "ADD R2.w, -R0, c[8].x;\n"
     "MAD R4.xyz, R1, R2.w, R3;\n"
-    "MUL R3.xyz, R0, R1.w;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
     "MUL R2.w, R1, R0;\n"
     "MAD R1.xyz, R1, R0.w, R3;\n"
     "SGE R1.xyz, R1, R2.w;\n"
@@ -6280,11 +6134,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "MAD R2.xyz, R1, R4, R2;\n"
     "ADD R1.z, R1.w, R0.w;\n"
     "MAD R2.w, -R1, R0, R1.z;\n"
-    "ADD R1.xy, fragment.position, c[0];\n"
-    "MUL R1.xy, R1, c[1];\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
     "TEX R1, R1, texture[1], 2D;\n"
     "ADD R2, R2, -R0;\n"
-    "DP4 R1.x, R1, c[2];\n"
+    "DP4 R1.x, R1, c[7];\n"
     "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
@@ -6292,25 +6146,26 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_COLORBURN =
     "!!ARBfp1.0\n"
     "PARAM c[9] = { program.local[0..7],\n"
-    "		{ 1, 9.9999997e-06 } };\n"
+    "		{ 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R1.x, R0, texture[2], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[2], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
-    "MUL R0.xy, fragment.position, c[7];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R2.xyz, R1.w, R0;\n"
     "MAD R3.xyz, R1, R0.w, R2;\n"
     "MAD R2.xyz, -R1.w, R0.w, R3;\n"
     "MUL R4.xyz, R1.w, R2;\n"
@@ -6325,18 +6180,17 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "MUL R4.xyz, R0, R3.w;\n"
     "MAD R1.xyz, R1, R2.w, R4;\n"
     "MUL R2.w, R1, R0;\n"
-    "ADD R3.w, -R1, c[8].x;\n"
     "MAD R2.xyz, R0, R3.w, R2;\n"
     "ADD R2.xyz, R2, -R1;\n"
     "SGE R3.xyz, R3, R2.w;\n"
     "MAD R2.xyz, R3, R2, R1;\n"
     "ADD R1.z, R1.w, R0.w;\n"
     "MAD R2.w, -R1, R0, R1.z;\n"
-    "ADD R1.xy, fragment.position, c[0];\n"
-    "MUL R1.xy, R1, c[1];\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
     "TEX R1, R1, texture[1], 2D;\n"
     "ADD R2, R2, -R0;\n"
-    "DP4 R1.x, R1, c[2];\n"
+    "DP4 R1.x, R1, c[7];\n"
     "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
@@ -6350,16 +6204,16 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "MOV R0.y, -R0;\n"
     "TEX R1.x, R0, texture[2], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
-    "MUL R0.xy, fragment.position, c[7];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "ADD R2.w, -R0, c[8].y;\n"
     "ADD R3.xyz, R1.w, -R1;\n"
@@ -6380,11 +6234,11 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "MAD R2.xyz, R1, R2, R3;\n"
     "ADD R1.z, R1.w, R0.w;\n"
     "MAD R2.w, -R1, R0, R1.z;\n"
-    "ADD R1.xy, fragment.position, c[0];\n"
-    "MUL R1.xy, R1, c[1];\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
     "TEX R1, R1, texture[1], 2D;\n"
     "ADD R2, R2, -R0;\n"
-    "DP4 R1.x, R1, c[2];\n"
+    "DP4 R1.x, R1, c[7];\n"
     "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
@@ -6392,68 +6246,66 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_SOFTLIGHT =
     "!!ARBfp1.0\n"
     "PARAM c[10] = { program.local[0..7],\n"
-    "		{ 1, 9.9999997e-06, 2, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 9.9999997e-006, 2, 3 },\n"
+    "		{ 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R1.xyz, R0, c[5];\n"
+    "TEMP R6;\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R1.xyz, R0, c[3];\n"
     "RCP R0.z, R1.z;\n"
     "MUL R1.xy, R1, R0.z;\n"
-    "MUL R1.xy, R1, c[6];\n"
+    "MUL R1.xy, R1, c[0];\n"
     "MOV R1.y, -R1;\n"
-    "MUL R0.xy, fragment.position, c[7];\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MAX R1.z, R0.w, c[8].y;\n"
     "RCP R2.w, R1.z;\n"
     "MUL R2.xyz, R0, R2.w;\n"
-    "MUL R5.xyz, -R2, c[8].w;\n"
-    "MAD R4.xyz, -R0, R2.w, c[8].x;\n"
+    "MUL R6.xyz, -R2, c[9].x;\n"
+    "MAD R3.xyz, -R0, R2.w, c[8].x;\n"
     "TEX R1.x, R1, texture[2], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
-    "MAD R3.xyz, R1, c[8].z, -R1.w;\n"
+    "MAD R4.xyz, R1, c[8].z, -R1.w;\n"
+    "MUL R5.xyz, R3, R4;\n"
+    "MAD R3.xyz, -R3, R4, R1.w;\n"
+    "ADD R6.xyz, R6, c[8].w;\n"
+    "MAD R5.xyz, -R5, R6, R1.w;\n"
     "RSQ R2.x, R2.x;\n"
     "RSQ R2.z, R2.z;\n"
     "RSQ R2.y, R2.y;\n"
-    "MUL R4.xyz, R4, R3;\n"
-    "ADD R5.xyz, R5, c[9].x;\n"
-    "MUL R5.xyz, R4, R5;\n"
-    "ADD R4.xyz, R1.w, -R4;\n"
+    "MUL R5.xyz, R0, R5;\n"
+    "MUL R3.xyz, R0, R3;\n"
     "ADD R2.w, -R0, c[8].x;\n"
     "RCP R2.x, R2.x;\n"
     "RCP R2.z, R2.z;\n"
     "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R2, R0.w, -R0;\n"
-    "MUL R3.xyz, R2, R3;\n"
-    "ADD R2.xyz, R1.w, -R5;\n"
-    "MAD R5.xyz, R0, R1.w, R3;\n"
-    "MUL R2.xyz, R0, R2;\n"
-    "MUL R3.xyz, R0, c[8].w;\n"
-    "ADD R5.xyz, R5, -R2;\n"
-    "SGE R3.xyz, R3, R0.w;\n"
-    "MUL R3.xyz, R3, R5;\n"
-    "ADD R2.xyz, R2, R3;\n"
-    "MUL R3.xyz, R0, R4;\n"
+    "MAD R2.xyz, R0.w, R2, -R0;\n"
+    "MUL R2.xyz, R2, R4;\n"
+    "MAD R2.xyz, R1.w, R0, R2;\n"
+    "ADD R6.xyz, R2, -R5;\n"
     "MUL R4.xyz, R1, c[8].z;\n"
+    "MUL R2.xyz, R0, c[9].x;\n"
+    "SGE R2.xyz, R2, R0.w;\n"
+    "MAD R2.xyz, R2, R6, R5;\n"
     "SGE R4.xyz, R4, R1.w;\n"
     "ADD R2.xyz, R2, -R3;\n"
-    "MUL R2.xyz, R4, R2;\n"
-    "ADD R2.xyz, R3, R2;\n"
+    "MAD R2.xyz, R4, R2, R3;\n"
     "MAD R1.xyz, R1, R2.w, R2;\n"
     "ADD R2.x, -R1.w, c[8];\n"
     "MAD R2.xyz, R0, R2.x, R1;\n"
     "ADD R1.z, R1.w, R0.w;\n"
     "MAD R2.w, -R1, R0, R1.z;\n"
-    "ADD R1.xy, fragment.position, c[0];\n"
-    "MUL R1.xy, R1, c[1];\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
     "TEX R1, R1, texture[1], 2D;\n"
     "ADD R2, R2, -R0;\n"
-    "DP4 R1.x, R1, c[2];\n"
+    "DP4 R1.x, R1, c[7];\n"
     "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
@@ -6466,107 +6318,106 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "MUL R0.zw, fragment.position.xyxy, c[7].xyxy;\n"
-    "TEX R1, R0.zwzw, texture[0], 2D;\n"
-    "TEX R0.x, R0, texture[2], 2D;\n"
-    "MUL R0, fragment.color.primary, R0.x;\n"
-    "ADD R3.xyz, R0, R1;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MUL R0.xyz, R0, R1.w;\n"
-    "MIN R0.xyz, R0, R2;\n"
-    "MAD R2.xyz, -R0, c[8].x, R3;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[2], 2D;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1, fragment.color.primary, R1.x;\n"
+    "ADD R2.xyz, R1, R0;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
+    "MUL R1.xyz, R1, R0.w;\n"
+    "MIN R1.xyz, R1, R3;\n"
+    "MAD R2.xyz, -R1, c[8].x, R2;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_EXCLUSION =
     "!!ARBfp1.0\n"
     "PARAM c[9] = { program.local[0..7],\n"
-    "		{ 1, 2 } };\n"
+    "		{ 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[4];\n"
-    "MAD R0.xyz, fragment.position.x, c[3], R0;\n"
-    "ADD R0.xyz, R0, c[5];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[6];\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R0.x, R0, texture[2], 2D;\n"
-    "MUL R1.xy, fragment.position, c[7];\n"
-    "TEX R1, R1, texture[0], 2D;\n"
-    "MUL R0, fragment.color.primary, R0.x;\n"
-    "MUL R2.xyz, R1, R0.w;\n"
-    "MAD R3.xyz, R0, R1.w, R2;\n"
-    "MUL R2.xyz, R0, R1;\n"
-    "MAD R2.xyz, -R2, c[8].y, R3;\n"
-    "ADD R2.w, -R1, c[8].x;\n"
-    "MAD R0.xyz, R0, R2.w, R2;\n"
-    "ADD R2.x, -R0.w, c[8];\n"
-    "MAD R2.xyz, R1, R2.x, R0;\n"
-    "ADD R0.z, R0.w, R1.w;\n"
-    "MAD R2.w, -R0, R1, R0.z;\n"
-    "ADD R0.xy, fragment.position, c[0];\n"
-    "MUL R0.xy, R0, c[1];\n"
-    "TEX R0, R0, texture[1], 2D;\n"
-    "ADD R2, R2, -R1;\n"
-    "DP4 R0.x, R0, c[2];\n"
-    "MAD result.color, R0.x, R2, R1;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[2], 2D;\n"
+    "MUL R0.xy, fragment.position, c[5];\n"
+    "TEX R0, R0, texture[0], 2D;\n"
+    "MUL R1, fragment.color.primary, R1.x;\n"
+    "MUL R2.xyz, R1.w, R0;\n"
+    "MAD R3.xyz, R1, R0.w, R2;\n"
+    "MUL R2.xyz, R1, R0;\n"
+    "MAD R2.xyz, -R2, c[8].x, R3;\n"
+    "ADD R2.w, -R0, c[8].y;\n"
+    "MAD R1.xyz, R1, R2.w, R2;\n"
+    "ADD R2.x, -R1.w, c[8].y;\n"
+    "MAD R2.xyz, R0, R2.x, R1;\n"
+    "ADD R1.z, R1.w, R0.w;\n"
+    "MAD R2.w, -R1, R0, R1.z;\n"
+    "ADD R1.xy, fragment.position, c[6];\n"
+    "MUL R1.xy, R1, c[4];\n"
+    "TEX R1, R1, texture[1], 2D;\n"
+    "ADD R2, R2, -R0;\n"
+    "DP4 R1.x, R1, c[7];\n"
+    "MAD result.color, R1.x, R2, R0;\n"
     "END\n"
     ;
 
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_SIMPLE_PORTER_DUFF_NOMASK =
     "!!ARBfp1.0\n"
-    "PARAM c[8] = { program.local[0..4],\n"
-    "		{ 1 },\n"
-    "		program.local[6..7] };\n"
+    "PARAM c[8] = { program.local[0..6],\n"
+    "		{ 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
-    "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.w, -R0.y;\n"
-    "MOV R0.z, R0.x;\n"
-    "TEX R1.x, R0.zwzw, texture[1], 2D;\n"
-    "MUL R0.xy, fragment.position, c[4];\n"
+    "MUL R0.zw, R0.xyxy, R0.z;\n"
+    "MUL R1.xy, R0.zwzw, c[0];\n"
+    "MOV R1.y, -R1;\n"
+    "MUL R0.xy, fragment.position, c[6];\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R2.xyz, R0, c[7].y;\n"
+    "MUL R2.xyz, R0, c[4].y;\n"
+    "TEX R1.x, R1, texture[1], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
-    "MUL R3.xyz, R2, R1.w;\n"
-    "MUL R2.xyz, R1, c[7].x;\n"
-    "MUL R0.xyz, R0, c[6].z;\n"
-    "MAD R2.xyz, R2, R0.w, R3;\n"
-    "MUL R1.xyz, R1, c[6].y;\n"
-    "ADD R2.w, -R0, c[5].x;\n"
-    "MAD R1.xyz, R1, R2.w, R2;\n"
-    "ADD R2.x, -R1.w, c[5];\n"
-    "MAD result.color.xyz, R0, R2.x, R1;\n"
-    "ADD R0.y, -R0.w, c[5].x;\n"
+    "MUL R3.xyz, R1.w, R2;\n"
+    "MUL R2.xyz, R1, c[4].x;\n"
+    "MUL R0.xyz, R0, c[5].z;\n"
+    "MAD R2.xyz, R0.w, R2, R3;\n"
+    "ADD R2.w, -R0, c[7].x;\n"
+    "MUL R1.xyz, R1, c[5].y;\n"
+    "MAD R1.xyz, R2.w, R1, R2;\n"
+    "ADD R2.x, -R1.w, c[7];\n"
+    "MAD result.color.xyz, R2.x, R0, R1;\n"
     "MUL R0.x, R1.w, R0.w;\n"
     "MUL R0.z, R0.w, R2.x;\n"
-    "MUL R0.y, R1.w, R0;\n"
-    "DP3 result.color.w, R0, c[6];\n"
+    "MUL R0.y, R1.w, R2.w;\n"
+    "DP3 result.color.w, R0, c[5];\n"
     "END\n"
     ;
 
@@ -6577,12 +6428,12 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.zw, R0.xyxy, R0.z;\n"
-    "MUL R1.xy, R0.zwzw, c[3];\n"
+    "MUL R1.xy, R0.zwzw, c[0];\n"
     "MOV R1.y, -R1;\n"
     "MUL R0.xy, fragment.position, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
@@ -6604,12 +6455,12 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "MOV R0.w, -R0.y;\n"
     "MOV R0.z, R0.x;\n"
     "TEX R1.x, R0.zwzw, texture[1], 2D;\n"
@@ -6629,12 +6480,12 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "MOV R0.y, -R0;\n"
     "TEX R1.x, R0, texture[1], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
@@ -6670,19 +6521,20 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R1.x, R0, texture[1], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[1], 2D;\n"
     "MUL R0.xy, fragment.position, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
     "MUL R2.xyz, R1, R0.w;\n"
-    "MUL R3.xyz, R0, R1.w;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
     "MIN R2.xyz, R2, R3;\n"
     "ADD R2.w, -R0, c[5].x;\n"
     "MAD R1.xyz, R1, R2.w, R2;\n"
@@ -6701,19 +6553,20 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R1.x, R0, texture[1], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[1], 2D;\n"
     "MUL R0.xy, fragment.position, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
     "MUL R2.xyz, R1, R0.w;\n"
-    "MUL R3.xyz, R0, R1.w;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
     "MAX R2.xyz, R2, R3;\n"
     "ADD R2.w, -R0, c[5].x;\n"
     "MAD R1.xyz, R1, R2.w, R2;\n"
@@ -6727,17 +6580,17 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_COLORDODGE_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..4],\n"
-    "		{ 1, 1e-06 } };\n"
+    "		{ 1, 1e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "MOV R0.y, -R0;\n"
     "TEX R0.x, R0, texture[1], 2D;\n"
     "MUL R1, fragment.color.primary, R0.x;\n"
@@ -6751,7 +6604,7 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "MUL R3.xyz, R0, R2.w;\n"
     "ADD R2.w, -R0, c[5].x;\n"
     "MAD R3.xyz, R1, R2.w, R3;\n"
-    "MUL R0.xyz, R0, R1.w;\n"
+    "MUL R0.xyz, R1.w, R0;\n"
     "RCP R2.x, R2.x;\n"
     "RCP R2.y, R2.y;\n"
     "RCP R2.z, R2.z;\n"
@@ -6770,25 +6623,26 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_COLORBURN_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..4],\n"
-    "		{ 1, 9.9999997e-06 } };\n"
+    "		{ 1, 9.9999997e-006 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R1.x, R0, texture[1], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[1], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
     "MUL R0.xy, fragment.position, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R2.xyz, R1.w, R0;\n"
     "MAD R3.xyz, R1, R0.w, R2;\n"
     "ADD R2.w, -R0, c[5].x;\n"
     "MAD R2.xyz, -R1.w, R0.w, R3;\n"
@@ -6801,9 +6655,8 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "RCP R2.z, R2.z;\n"
     "MAD R2.xyz, R4, R2, R5;\n"
     "MUL R4.xyz, R0, R3.w;\n"
-    "MAD R1.xyz, R1, R2.w, R4;\n"
-    "ADD R3.w, -R1, c[5].x;\n"
     "MAD R0.xyz, R0, R3.w, R2;\n"
+    "MAD R1.xyz, R1, R2.w, R4;\n"
     "MUL R2.x, R1.w, R0.w;\n"
     "ADD R2.w, R1, R0;\n"
     "ADD R0.xyz, R0, -R1;\n"
@@ -6822,12 +6675,12 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "MOV R0.y, -R0;\n"
     "TEX R1.x, R0, texture[1], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
@@ -6858,57 +6711,55 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_SOFTLIGHT_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[7] = { program.local[0..4],\n"
-    "		{ 1, 9.9999997e-06, 2, 8 },\n"
-    "		{ 3 } };\n"
+    "		{ 1, 9.9999997e-006, 2, 3 },\n"
+    "		{ 8 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
     "TEMP R4;\n"
     "TEMP R5;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R1.xyz, R0, c[2];\n"
+    "TEMP R6;\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R1.xyz, R0, c[3];\n"
     "RCP R0.z, R1.z;\n"
     "MUL R1.xy, R1, R0.z;\n"
-    "MUL R1.xy, R1, c[3];\n"
+    "MUL R1.xy, R1, c[0];\n"
     "MOV R1.y, -R1;\n"
     "MUL R0.xy, fragment.position, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MAX R1.z, R0.w, c[5].y;\n"
     "RCP R2.w, R1.z;\n"
     "MUL R2.xyz, R0, R2.w;\n"
-    "MUL R5.xyz, -R2, c[5].w;\n"
-    "MAD R4.xyz, -R0, R2.w, c[5].x;\n"
+    "MUL R6.xyz, -R2, c[6].x;\n"
+    "MAD R3.xyz, -R0, R2.w, c[5].x;\n"
     "TEX R1.x, R1, texture[1], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
-    "MAD R3.xyz, R1, c[5].z, -R1.w;\n"
+    "MAD R4.xyz, R1, c[5].z, -R1.w;\n"
+    "MUL R5.xyz, R3, R4;\n"
+    "MAD R3.xyz, -R3, R4, R1.w;\n"
+    "ADD R6.xyz, R6, c[5].w;\n"
+    "MAD R5.xyz, -R5, R6, R1.w;\n"
     "RSQ R2.x, R2.x;\n"
     "RSQ R2.z, R2.z;\n"
     "RSQ R2.y, R2.y;\n"
-    "MUL R4.xyz, R4, R3;\n"
-    "ADD R5.xyz, R5, c[6].x;\n"
-    "MUL R5.xyz, R4, R5;\n"
-    "ADD R4.xyz, R1.w, -R4;\n"
+    "MUL R5.xyz, R0, R5;\n"
+    "MUL R3.xyz, R0, R3;\n"
     "RCP R2.x, R2.x;\n"
     "RCP R2.z, R2.z;\n"
     "RCP R2.y, R2.y;\n"
-    "MAD R2.xyz, R2, R0.w, -R0;\n"
-    "MUL R3.xyz, R2, R3;\n"
-    "ADD R2.xyz, R1.w, -R5;\n"
-    "MAD R5.xyz, R0, R1.w, R3;\n"
-    "MUL R2.xyz, R0, R2;\n"
-    "MUL R3.xyz, R0, c[5].w;\n"
-    "ADD R5.xyz, R5, -R2;\n"
-    "SGE R3.xyz, R3, R0.w;\n"
-    "MUL R3.xyz, R3, R5;\n"
-    "ADD R2.xyz, R2, R3;\n"
-    "MUL R3.xyz, R0, R4;\n"
+    "MAD R2.xyz, R0.w, R2, -R0;\n"
+    "MUL R2.xyz, R2, R4;\n"
+    "MAD R2.xyz, R1.w, R0, R2;\n"
+    "ADD R6.xyz, R2, -R5;\n"
     "MUL R4.xyz, R1, c[5].z;\n"
+    "MUL R2.xyz, R0, c[6].x;\n"
+    "SGE R2.xyz, R2, R0.w;\n"
+    "MAD R2.xyz, R2, R6, R5;\n"
     "ADD R2.xyz, R2, -R3;\n"
     "SGE R4.xyz, R4, R1.w;\n"
-    "MUL R2.xyz, R4, R2;\n"
-    "ADD R2.xyz, R3, R2;\n"
+    "MAD R2.xyz, R4, R2, R3;\n"
     "ADD R2.w, -R0, c[5].x;\n"
     "MAD R1.xyz, R1, R2.w, R2;\n"
     "ADD R2.x, R1.w, R0.w;\n"
@@ -6926,18 +6777,19 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R1.x, R0, texture[1], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[1], 2D;\n"
     "MUL R0.xy, fragment.position, c[4];\n"
-    "MUL R1, fragment.color.primary, R1.x;\n"
     "TEX R0, R0, texture[0], 2D;\n"
-    "MUL R3.xyz, R0, R1.w;\n"
+    "MUL R1, fragment.color.primary, R1.x;\n"
+    "MUL R3.xyz, R1.w, R0;\n"
     "MUL R2.xyz, R1, R0.w;\n"
     "ADD R0.xyz, R1, R0;\n"
     "MIN R2.xyz, R2, R3;\n"
@@ -6950,30 +6802,31 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
 static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MODES_EXCLUSION_NOMASK =
     "!!ARBfp1.0\n"
     "PARAM c[6] = { program.local[0..4],\n"
-    "		{ 1, 2 } };\n"
+    "		{ 2, 1 } };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
     "TEMP R2;\n"
     "TEMP R3;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
-    "MOV R0.y, -R0;\n"
-    "TEX R1.x, R0, texture[1], 2D;\n"
+    "MUL R0.xy, R0, c[0];\n"
+    "MOV R0.w, -R0.y;\n"
+    "MOV R0.z, R0.x;\n"
+    "TEX R1.x, R0.zwzw, texture[1], 2D;\n"
     "MUL R0.xy, fragment.position, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "MUL R1, fragment.color.primary, R1.x;\n"
-    "MUL R2.xyz, R0, R1.w;\n"
+    "MUL R2.xyz, R1.w, R0;\n"
     "MAD R3.xyz, R1, R0.w, R2;\n"
     "MUL R2.xyz, R1, R0;\n"
-    "MAD R2.xyz, -R2, c[5].y, R3;\n"
-    "ADD R2.w, -R0, c[5].x;\n"
+    "MAD R2.xyz, -R2, c[5].x, R3;\n"
+    "ADD R2.w, -R0, c[5].y;\n"
     "MAD R1.xyz, R1, R2.w, R2;\n"
     "ADD R2.x, R1.w, R0.w;\n"
-    "ADD R2.y, -R1.w, c[5].x;\n"
+    "ADD R2.y, -R1.w, c[5];\n"
     "MAD result.color.xyz, R0, R2.y, R1;\n"
     "MAD result.color.w, -R1, R0, R2.x;\n"
     "END\n"
@@ -6984,15 +6837,15 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "PARAM c[7] = { program.local[0..6] };\n"
     "TEMP R0;\n"
     "TEMP R1;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R1.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R1.xyz, R0, c[3];\n"
     "RCP R0.z, R1.z;\n"
     "MUL R0.zw, R1.xyxy, R0.z;\n"
-    "MUL R1.xy, R0.zwzw, c[3];\n"
+    "MUL R1.xy, R0.zwzw, c[0];\n"
     "MOV R1.y, -R1;\n"
-    "ADD R0.xy, fragment.position, c[4];\n"
-    "MUL R0.xy, R0, c[5];\n"
+    "ADD R0.xy, fragment.position, c[5];\n"
+    "MUL R0.xy, R0, c[4];\n"
     "TEX R0, R0, texture[0], 2D;\n"
     "TEX R1.x, R1, texture[1], 2D;\n"
     "DP4 R0.x, R0, c[6];\n"
@@ -7005,12 +6858,12 @@ static const char *FragmentProgram_FRAGMENT_PROGRAM_BRUSH_PATTERN_COMPOSITION_MO
     "!!ARBfp1.0\n"
     "PARAM c[4] = { program.local[0..3] };\n"
     "TEMP R0;\n"
-    "MUL R0.xyz, fragment.position.y, c[1];\n"
-    "MAD R0.xyz, fragment.position.x, c[0], R0;\n"
-    "ADD R0.xyz, R0, c[2];\n"
+    "MUL R0.xyz, fragment.position.y, c[2];\n"
+    "MAD R0.xyz, fragment.position.x, c[1], R0;\n"
+    "ADD R0.xyz, R0, c[3];\n"
     "RCP R0.z, R0.z;\n"
     "MUL R0.xy, R0, R0.z;\n"
-    "MUL R0.xy, R0, c[3];\n"
+    "MUL R0.xy, R0, c[0];\n"
     "MOV R0.y, -R0;\n"
     "TEX R0.x, R0, texture[0], 2D;\n"
     "MUL result.color, fragment.color.primary, R0.x;\n"
@@ -7195,19 +7048,19 @@ static const char *painter_fragment_program_sources[num_fragment_brushes][num_fr
 
 static int painter_variable_locations[num_fragment_brushes][num_fragment_composition_modes][num_fragment_variables] = {
     {
-        { -1, -1, -1, 1, -1, 6, 2, -1, 5, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, 3, 1, 0, -1, 0, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, -1, -1, 3, -1, -1, 2, 0, -1, 0, -1, -1, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 2, -1, 0, 5, -1, 1, 3, 1, 0, -1, 4, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 3, -1, -1, 1, 1, 0, -1, 2, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, -1, -1, 0, -1, -1, 1, 2, -1, 0, -1, -1, -1, -1, -1, -1, -1, },
         { -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 0, -1, -1, -1, -1, -1, -1, -1, },
         { -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 0, -1, -1, -1, -1, -1, -1, -1, },
         { -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 0, -1, -1, -1, -1, -1, -1, -1, },
@@ -7219,154 +7072,154 @@ static int painter_variable_locations[num_fragment_brushes][num_fragment_composi
         { -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 0, -1, -1, -1, -1, -1, -1, -1, },
         { -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 0, -1, -1, -1, -1, -1, -1, -1, },
         { -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, 0, -1, -1, -1, -1, -1, -1, -1, },
-        { -1, -1, -1, 1, -1, -1, 2, -1, -1, -1, 0, -1, -1, 0, -1, -1, -1, -1, -1, },
+        { -1, -1, -1, 0, -1, -1, 2, -1, -1, -1, 0, -1, -1, 1, -1, -1, -1, -1, -1, },
         { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, },
     },
     {
-        { -1, -1, 4, 1, 5, 11, 2, -1, 10, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 9, 1, 0, 2, 0, -1, 8, 6, 3, -1, },
-        { -1, -1, 1, -1, 2, 8, -1, -1, 7, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 6, -1, 0, 1, -1, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, 7, 2, -1, 8, -1, -1, -1, 0, -1, 1, 6, -1, 5, 3, 0, -1, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 5, 3, 0, -1, },
+        { -1, -1, 3, 7, 4, 5, 10, -1, 6, 8, 1, 0, 2, 9, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 8, -1, -1, 6, 1, 0, 2, 7, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, 5, -1, -1, 6, 7, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, 5, -1, 0, 1, -1, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, 5, 4, -1, 7, -1, -1, -1, 0, -1, 1, 6, -1, 1, 0, 2, -1, },
+        { -1, -1, 3, -1, 4, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 1, 0, 2, -1, },
     },
     {
-        { -1, -1, 4, 1, 5, 12, 2, -1, 11, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 4, 1, 5, -1, 2, -1, -1, 10, 1, 0, 2, 0, -1, -1, -1, 3, 8, },
-        { -1, -1, 1, -1, 2, 9, -1, -1, 8, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, 7, -1, 0, 1, -1, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, 8, 2, -1, 9, -1, -1, -1, 0, -1, 1, 7, -1, -1, -1, 0, 5, },
-        { -1, -1, 1, -1, 2, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, 0, 5, },
+        { -1, -1, 2, 6, 3, 4, 9, -1, 5, 7, 1, 0, 2, 8, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, 4, -1, -1, 5, 6, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, 4, 3, -1, 6, -1, -1, -1, 0, -1, 1, 5, -1, -1, -1, 1, 0, },
+        { -1, -1, 2, -1, 3, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, 1, 0, },
     },
     {
-        { -1, 6, 4, 1, 5, 10, 2, -1, 9, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 6, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, 2, 0, -1, -1, -1, 3, -1, },
-        { -1, 3, 1, -1, 2, 7, -1, -1, 6, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, 5, 2, -1, 6, -1, -1, -1, 0, -1, 1, 4, -1, -1, -1, 0, -1, },
-        { -1, 3, 1, -1, 2, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, 0, -1, },
+        { -1, 0, 2, 6, 3, 4, 9, -1, 5, 7, 1, 0, 2, 8, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, 2, 6, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, 4, -1, -1, 5, 6, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, 1, -1, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, 4, 3, -1, 6, -1, -1, -1, 0, -1, 1, 5, -1, -1, -1, 1, -1, },
+        { -1, 0, 2, -1, 3, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, 1, -1, },
     },
     {
-        { 2, -1, 4, 1, 5, 10, 2, -1, 9, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 1, -1, 1, -1, 2, 7, -1, -1, 6, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, 5, 2, -1, 6, -1, -1, -1, 0, -1, -1, 4, 3, -1, -1, 0, -1, },
-        { 0, -1, 1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, 0, -1, },
+        { 2, -1, 2, 6, 3, 4, 9, -1, 5, 7, 1, 0, -1, 8, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, 4, -1, -1, 5, 6, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, 4, 3, -1, 6, -1, -1, -1, 0, -1, -1, 5, 0, -1, -1, 1, -1, },
+        { 0, -1, 2, -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 1, -1, },
     },
     {
-        { 2, -1, 4, 1, 5, 10, 2, -1, 9, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 2, -1, 4, 1, 5, -1, 2, -1, -1, 7, 1, 0, -1, 0, 6, -1, -1, 3, -1, },
-        { 1, -1, 1, -1, 2, 7, -1, -1, 6, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, -1, 2, -1, -1, -1, -1, 4, -1, 0, -1, -1, 3, -1, -1, 0, -1, },
-        { 1, -1, 1, 5, 2, -1, 6, -1, -1, -1, 0, -1, -1, 4, 3, -1, -1, 0, -1, },
-        { 0, -1, 1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, -1, 0, -1, },
+        { 2, -1, 2, 6, 3, 4, 9, -1, 5, 7, 1, 0, -1, 8, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 2, -1, 2, 4, 3, -1, 7, -1, -1, 5, 1, 0, -1, 6, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, 4, -1, -1, 5, 6, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, -1, 3, -1, -1, -1, -1, 4, -1, 0, -1, -1, 0, -1, -1, 1, -1, },
+        { 1, -1, 2, 4, 3, -1, 6, -1, -1, -1, 0, -1, -1, 5, 0, -1, -1, 1, -1, },
+        { 0, -1, 2, -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, 1, -1, },
     },
 };
 
 static int mask_variable_locations[num_fragment_masks][num_fragment_variables] = {
     { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, },
-    { -1, -1, 2, -1, 3, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, },
+    { -1, -1, 1, -1, 2, -1, -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, -1, },
 };
 
 #endif
diff --git a/src/opengl/util/generator.pro b/src/opengl/util/generator.pro
index 9425dbe..ac71934 100644
--- a/src/opengl/util/generator.pro
+++ b/src/opengl/util/generator.pro
@@ -9,3 +9,5 @@ INCLUDEPATH += .
 
 # Input
 SOURCES += generator.cpp
+
+CONFIG += console
diff --git a/src/opengl/util/texture_brush.glsl b/src/opengl/util/texture_brush.glsl
index 93865b8..9498255 100644
--- a/src/opengl/util/texture_brush.glsl
+++ b/src/opengl/util/texture_brush.glsl
@@ -17,7 +17,5 @@ vec4 brush()
 
     coords *= inv_brush_texture_size;
 
-    coords.y = -coords.y;
-
     return texture2D(brush_texture, coords);
 }
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index c14e38a..596fd8f 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -468,7 +468,7 @@ bool isFunction(JSC::JSValue value)
 static JSC::JSValue JSC_HOST_CALL functionConnect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
 static JSC::JSValue JSC_HOST_CALL functionDisconnect(JSC::ExecState*, JSC::JSObject*, JSC::JSValue, const JSC::ArgList&);
 
-JSC::JSValue JSC_HOST_CALL functionDisconnect(JSC::ExecState *exec, JSC::JSObject */*callee*/, JSC::JSValue thisObject, const JSC::ArgList &args)
+JSC::JSValue JSC_HOST_CALL functionDisconnect(JSC::ExecState *exec, JSC::JSObject * /*callee*/, JSC::JSValue thisObject, const JSC::ArgList &args)
 {
 #ifndef QT_NO_QOBJECT
     if (args.size() == 0) {
@@ -533,7 +533,7 @@ JSC::JSValue JSC_HOST_CALL functionDisconnect(JSC::ExecState *exec, JSC::JSObjec
 #endif // QT_NO_QOBJECT
 }
 
-JSC::JSValue JSC_HOST_CALL functionConnect(JSC::ExecState *exec, JSC::JSObject */*callee*/, JSC::JSValue thisObject, const JSC::ArgList &args)
+JSC::JSValue JSC_HOST_CALL functionConnect(JSC::ExecState *exec, JSC::JSObject * /*callee*/, JSC::JSValue thisObject, const JSC::ArgList &args)
 {
 #ifndef QT_NO_QOBJECT
     if (args.size() == 0) {
diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
index d7cbcb2..e6b0e8e 100644
--- a/src/svg/qsvgtinydocument.cpp
+++ b/src/svg/qsvgtinydocument.cpp
@@ -240,7 +240,7 @@ void QSvgTinyDocument::draw(QPainter *p, const QRectF &bounds)
     //sets default style on the painter
     //### not the most optimal way
     mapSourceToTarget(p, bounds);
-    QPen pen(QBrush(Qt::NoBrush), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+    QPen pen(Qt::NoBrush, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
     pen.setMiterLimit(4);
     p->setPen(pen);
     p->setBrush(Qt::black);
@@ -283,7 +283,7 @@ void QSvgTinyDocument::draw(QPainter *p, const QString &id,
     QTransform originalTransform = p->worldTransform();
 
     //XXX set default style on the painter
-    QPen pen(QBrush(Qt::NoBrush), 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+    QPen pen(Qt::NoBrush, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
     pen.setMiterLimit(4);
     p->setPen(pen);
     p->setBrush(Qt::black);