Improve handling of FF vertex array state

src/gpu/gl/GrGpuGL.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 "GrGLStencilBuffer.h"
@@ skipping 353 matching lines @@
         fHWBoundRenderTarget = NULL;
     }
 
     if (resetBits & kFixedFunction_GrGLBackendState && this->glCaps().fixedFunctionSupport()) {
 
         fHWProjectionMatrixState.invalidate();
         // we don't use the model view matrix.
         GL_CALL(MatrixMode(GR_GL_MODELVIEW));
         GL_CALL(LoadIdentity());
 
-        // When we use fixed function vertex processing we always use the vertex array
-        // and none of the other arrays.
-        GL_CALL(EnableClientState(GR_GL_VERTEX_ARRAY));
-        GL_CALL(DisableClientState(GR_GL_NORMAL_ARRAY));
-        GL_CALL(DisableClientState(GR_GL_COLOR_ARRAY));
-        GL_CALL(DisableClientState(GR_GL_INDEX_ARRAY));
-        GL_CALL(DisableClientState(GR_GL_EDGE_FLAG_ARRAY));
         for (int i = 0; i < this->glCaps().maxFixedFunctionTextureCoords(); ++i) {
-            GL_CALL(ClientActiveTexture(GR_GL_TEXTURE0 + i));
-            GL_CALL(DisableClientState(GR_GL_TEXTURE_COORD_ARRAY));
-
             GL_CALL(ActiveTexture(GR_GL_TEXTURE0 + i));
             GL_CALL(Disable(GR_GL_TEXTURE_GEN_S));
             GL_CALL(Disable(GR_GL_TEXTURE_GEN_T));
             GL_CALL(Disable(GR_GL_TEXTURE_GEN_Q));
             GL_CALL(Disable(GR_GL_TEXTURE_GEN_R));
         }
     }
 
     // we assume these values
     if (resetBits & kPixelStore_GrGLBackendState) {
@@ skipping 2203 matching lines @@
             this->setVertexArrayID(gpu, 0);
         }
         int attrCount = gpu->glCaps().maxVertexAttributes();
         if (fDefaultVertexArrayAttribState.count() != attrCount) {
             fDefaultVertexArrayAttribState.resize(attrCount);
         }
         attribState = &fDefaultVertexArrayAttribState;
     }
     return attribState;
 }