Add getGLMatrix method to MatrixState

src/gpu/gl/GrGpuGL_program.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGpuGL.h"
 
 #include "GrEffect.h"
@@ skipping 194 matching lines @@
 void GrGpuGL::flushPathStencilMatrix() {
     const SkMatrix& viewMatrix = this->getDrawState().getViewMatrix();
     const GrRenderTarget* rt = this->getDrawState().getRenderTarget();
     SkISize size;
     size.set(rt->width(), rt->height());
     const SkMatrix& vm = this->getDrawState().getViewMatrix();
 
     if (fHWProjectionMatrixState.fRenderTargetOrigin != rt->origin() ||
         !fHWProjectionMatrixState.fViewMatrix.cheapEqualTo(viewMatrix) ||
         fHWProjectionMatrixState.fRenderTargetSize!= size) {
-        // rescale the coords from skia's "device" coords to GL's normalized coords,
-        // and perform a y-flip if required.
-        SkMatrix m;
-        if (kBottomLeft_GrSurfaceOrigin == rt->origin()) {
-            m.setScale(SkIntToScalar(2) / rt->width(), SkIntToScalar(-2) / rt->height());
-            m.postTranslate(-SK_Scalar1, SK_Scalar1);
-        } else {
-            m.setScale(SkIntToScalar(2) / rt->width(), SkIntToScalar(2) / rt->height());
-            m.postTranslate(-SK_Scalar1, -SK_Scalar1);
-        }
-        m.preConcat(vm);
 
-        // GL wants a column-major 4x4.
-        GrGLfloat mv[]  = {
-            // col 0
-            SkScalarToFloat(m[SkMatrix::kMScaleX]),
-            SkScalarToFloat(m[SkMatrix::kMSkewY]),
-            0,
-            SkScalarToFloat(m[SkMatrix::kMPersp0]),
-
-            // col 1
-            SkScalarToFloat(m[SkMatrix::kMSkewX]),
-            SkScalarToFloat(m[SkMatrix::kMScaleY]),
-            0,
-            SkScalarToFloat(m[SkMatrix::kMPersp1]),
-
-            // col 2
-            0, 0, 0, 0,
-
-            // col3
-            SkScalarToFloat(m[SkMatrix::kMTransX]),
-            SkScalarToFloat(m[SkMatrix::kMTransY]),
-            0.0f,
-            SkScalarToFloat(m[SkMatrix::kMPersp2])
-        };
-        GL_CALL(MatrixMode(GR_GL_PROJECTION));
-        GL_CALL(LoadMatrixf(mv));
         fHWProjectionMatrixState.fViewMatrix = vm;
         fHWProjectionMatrixState.fRenderTargetSize = size;
         fHWProjectionMatrixState.fRenderTargetOrigin = rt->origin();
+
+        GrGLfloat projectionMatrix[4 * 4];
+        fHWProjectionMatrixState.getGLMatrix<4>(projectionMatrix);
+        GL_CALL(MatrixMode(GR_GL_PROJECTION));
+        GL_CALL(LoadMatrixf(projectionMatrix));

[Mark Kilgard, 2013/09/05 18:39:34]

BTW, good opportunity to simply use DSA GL_CALL version of:

glMatrixLoadfEXT(GL_PROJECTION, projectionMatrix);

We are considering having a glMatrixLoad3x3fEXT entry point that would make
sense here.

[bsalomon, 2013/09/05 18:40:44]

nice!

     }
 }
 
 bool GrGpuGL::flushGraphicsState(DrawType type, const GrDeviceCoordTexture* dstCopy) {
     const GrDrawState& drawState = this->getDrawState();
 
     // GrGpu::setupClipAndFlushState should have already checked this and bailed if not true.
     SkASSERT(NULL != drawState.getRenderTarget());
 
     if (kStencilPath_DrawType == type) {
@@ skipping 132 matching lines @@
                          GrGLAttribTypeToLayout(attribType).fCount,
                          GrGLAttribTypeToLayout(attribType).fType,
                          GrGLAttribTypeToLayout(attribType).fNormalized,
                          stride,
                          reinterpret_cast<GrGLvoid*>(
                          vertexOffsetInBytes + vertexAttrib->fOffset));
     }
 
     attribState->disableUnusedAttribArrays(this, usedAttribArraysMask);
 }