Improve handling of FF vertex array state

src/gpu/gl/GrGLVertexArray.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLVertexArray_DEFINED
 #define GrGLVertexArray_DEFINED
 
@@ skipping 31 matching lines @@
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kLayouts) == kGrVertexAttribTypeCount);
     return kLayouts[type];
 }
 
 /**
  * This sets and tracks the vertex attribute array state. It is used internally by GrGLVertexArray
  * (below) but is separate because it is also used to track the state of vertex array object 0.
  */
 class GrGLAttribArrayState {
 public:
-    explicit GrGLAttribArrayState(int arrayCount = 0) { this->resize(arrayCount); }
+    explicit GrGLAttribArrayState(int arrayCount = 0) {
+        this->resize(arrayCount);
+        // glVertexPointer doesn't have a normalization param.
+        fFixedFunctionVertexArray.fNormalized = false;
+        fUnusedFixedFunctionArraysDisabled = false;
+    }
 
     void resize(int newCount) {
         fAttribArrayStates.resize_back(newCount);
         for (int i = 0; i < newCount; ++i) {
             fAttribArrayStates[i].invalidate();
         }
     }
 
     /**
      * This function enables and sets vertex attrib state for the specified attrib index. It is
      * assumed that the GrGLAttribArrayState is tracking the state of the currently bound vertex
      * array object.
      */
     void set(const GrGpuGL*,
              int index,
              GrGLVertexBuffer*,
              GrGLint size,
              GrGLenum type,
              GrGLboolean normalized,
              GrGLsizei stride,
              GrGLvoid* offset);
 
+    void setFixedFunctionVertexArray(const GrGpuGL*,
+                                     GrGLVertexBuffer*,
+                                     GrGLint size,
+                                     GrGLenum type,
+                                     GrGLsizei stride,
+                                     GrGLvoid* offset);
+
     /**
      * This function disables vertex attribs not present in the mask. It is assumed that the
      * GrGLAttribArrayState is tracking the state of the currently bound vertex array object.
      */
-    void disableUnusedAttribArrays(const GrGpuGL*, uint64_t usedAttribArrayMask);
+    void disableUnusedArrays(const GrGpuGL*, uint64_t usedAttribArrayMask, bool usingFFVertexArray);
 
     void invalidate() {
         int count = fAttribArrayStates.count();
         for (int i = 0; i < count; ++i) {
             fAttribArrayStates[i].invalidate();
         }
+        fFixedFunctionVertexArray.invalidate();

[robertphillips, 2013/09/09 13:53:33]

Does this really need to get reset here (fUnusedFixedFunctionArraysDisabled)?

[bsalomon, 2013/09/09 14:11:44]

I think so... this comes from onResetContext(). The caller may have enabled
normal pointers, for example, and that could cause an access violation when we
go to draw.

+        fUnusedFixedFunctionArraysDisabled = false;
     }
 
     void notifyVertexBufferDelete(GrGLuint id) {
         int count = fAttribArrayStates.count();
         for (int i = 0; i < count; ++i) {
             if (fAttribArrayStates[i].fAttribPointerIsValid &&
                 id == fAttribArrayStates[i].fVertexBufferID) {
                 fAttribArrayStates[i].invalidate();
             }
         }
+        if (fFixedFunctionVertexArray.fAttribPointerIsValid &&
+            id == fFixedFunctionVertexArray.fVertexBufferID) {
+            fFixedFunctionVertexArray.invalidate();
+        }
     }
 
     /**
      * The number of attrib arrays that this object is configured to track.
      */
     int count() const { return fAttribArrayStates.count(); }
 
 private:
     /**
      * Tracks the state of glVertexAttribArray for an attribute index.
      */
     struct AttribArrayState {
             void invalidate() {
                 fEnableIsValid = false;
                 fAttribPointerIsValid = false;
             }
 
             bool        fEnableIsValid;
             bool        fAttribPointerIsValid;
             bool        fEnabled;
             GrGLuint    fVertexBufferID;
             GrGLint     fSize;
             GrGLenum    fType;
             GrGLboolean fNormalized;
             GrGLsizei   fStride;
             GrGLvoid*   fOffset;
     };
 
     SkSTArray<16, AttribArrayState, true> fAttribArrayStates;
+
+    // Tracks the array specified by glVertexPointer.
+    AttribArrayState fFixedFunctionVertexArray;
+

[robertphillips, 2013/09/09 13:53:33]

// informative comment?

[bsalomon, 2013/09/09 14:11:44]

Done.

+    bool fUnusedFixedFunctionArraysDisabled;
 };
 
 /**
  * This class represents an OpenGL vertex array object. It manages the lifetime of the vertex array
  * and is used to track the state of the vertex array to avoid redundant GL calls.
  */
 class GrGLVertexArray : public GrResource {
 public:
     GrGLVertexArray(GrGpuGL* gpu, GrGLint id, int attribCount);
 
@@ skipping 30 matching lines @@
 private:
     GrGLuint                fID;
     GrGLAttribArrayState    fAttribArrays;
     GrGLuint                fIndexBufferID;
     bool                    fIndexBufferIDIsValid;
 
     typedef GrResource INHERITED;
 };
 
 #endif