separate view matrix from rt adjustment

src/gpu/gl/GrGLProgram.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 "GrGLProgram.h"
 
 #include "GrAllocator.h"
@@ skipping 34 matching lines @@
 
     fDstCopyTexUnit = -1;
 
     fColor = GrColor_ILLEGAL;
 
     if (fDesc.getHeader().fHasVertexCode ||
         !fGpu->shouldUseFixedFunctionTexturing()) {
         GrGLFullShaderBuilder fullBuilder(fGpu, fUniformManager, fDesc);
         if (this->genProgram(&fullBuilder, colorStages, coverageStages)) {
             fUniformHandles.fViewMatrixUni = fullBuilder.getViewMatrixUniform();
+            fUniformHandles.fRTAdjustmentUni = fullBuilder.getRTAdjustmentVecUniform();
             fHasVertexShader = true;
         }
     } else {
         GrGLFragmentOnlyShaderBuilder fragmentOnlyBuilder(fGpu, fUniformManager, fDesc);
         if (this->genProgram(&fragmentOnlyBuilder, colorStages, coverageStages)) {
             fNumTexCoordSets = fragmentOnlyBuilder.getNumTexCoordSets();
         }
     }
 }
 
@@ skipping 257 matching lines @@
     size.set(rt->width(), rt->height());
 
     // Load the RT height uniform if it is needed to y-flip gl_FragCoord.
     if (fUniformHandles.fRTHeightUni.isValid() &&
         fMatrixState.fRenderTargetSize.fHeight != size.fHeight) {
         fUniformManager.set1f(fUniformHandles.fRTHeightUni, SkIntToScalar(size.fHeight));
     }
 
     if (!fHasVertexShader) {
         SkASSERT(!fUniformHandles.fViewMatrixUni.isValid());
+        SkASSERT(!fUniformHandles.fRTAdjustmentUni.isValid());
         fGpu->setProjectionMatrix(drawState.getViewMatrix(), size, rt->origin());
     } else if (fMatrixState.fRenderTargetOrigin != rt->origin() ||
                fMatrixState.fRenderTargetSize != size ||
                !fMatrixState.fViewMatrix.cheapEqualTo(drawState.getViewMatrix())) {
         SkASSERT(fUniformHandles.fViewMatrixUni.isValid());
 
         fMatrixState.fViewMatrix = drawState.getViewMatrix();
         fMatrixState.fRenderTargetSize = size;
         fMatrixState.fRenderTargetOrigin = rt->origin();
 
         GrGLfloat viewMatrix[3 * 3];
         fMatrixState.getGLMatrix<3>(viewMatrix);
         fUniformManager.setMatrix3f(fUniformHandles.fViewMatrixUni, viewMatrix);
+
+        GrGLfloat rtAdjustmentVec[4];
+        fMatrixState.getRTAdjustmentVec(rtAdjustmentVec);
+        fUniformManager.set4fv(fUniformHandles.fRTAdjustmentUni, 1, rtAdjustmentVec);
     }
 }