Fix few inconsistencies in handling fixed-function texture coordinate set generation

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 223 matching lines @@
         }
     } else {
         SkASSERT(!fUniformHandles.fDstCopyTopLeftUni.isValid());
         SkASSERT(!fUniformHandles.fDstCopyScaleUni.isValid());
         SkASSERT(!fUniformHandles.fDstCopySamplerUni.isValid());
     }
 
     fColorEffects->setData(fGpu, fUniformManager, colorStages);
     fCoverageEffects->setData(fGpu, fUniformManager, coverageStages);
 
-    if (!fHasVertexShader) {
-        fGpu->disableUnusedTexGen(fNumTexCoordSets);
+    if (fGpu->glCaps().fixedFunctionSupport()) {

[Chris Dalton, 2013/10/31 17:49:09]

I think it would be best to leave this as 'if (!fHasVertexShader)'.

TexGen state applies to the the fixed function vertex shader, so when you have
you own shader, it's ignored. We could potentially save some work by just
leaving it if there's a vertex shader.

[Kimmo Kinnunen, 2013/11/01 06:32:11]

Done.

+        fGpu->flushTexGenSettings(fNumTexCoordSets);
     }
 }
 
 void GrGLProgram::setColor(const GrDrawState& drawState,
                            GrColor color,
                            SharedGLState* sharedState) {
     const GrGLProgramDesc::KeyHeader& header = fDesc.getHeader();
     if (!drawState.hasColorVertexAttribute()) {
         switch (header.fColorInput) {
             case GrGLProgramDesc::kAttribute_ColorInput:
@@ skipping 90 matching lines @@
 
         fMatrixState.fViewMatrix = drawState.getViewMatrix();
         fMatrixState.fRenderTargetSize = size;
         fMatrixState.fRenderTargetOrigin = rt->origin();
 
         GrGLfloat viewMatrix[3 * 3];
         fMatrixState.getGLMatrix<3>(viewMatrix);
         fUniformManager.setMatrix3f(fUniformHandles.fViewMatrixUni, viewMatrix);
     }
 }