Update effect key for descriptor to not record offsets.

src/gpu/gl/GrGLProgramDesc.h

Index: src/gpu/gl/GrGLProgramDesc.h
diff --git a/src/gpu/gl/GrGLProgramDesc.h b/src/gpu/gl/GrGLProgramDesc.h
index 8b032e099ce0998f8b2adf9b7c5bf0f56a3381c8..74ec90c8cb795904968a8f5050de26be18c742bc 100644
--- a/src/gpu/gl/GrGLProgramDesc.h
+++ b/src/gpu/gl/GrGLProgramDesc.h
@@ -29,16 +29,15 @@ public:
     // 1. uint32_t for total key length.
     // 2. uint32_t for a checksum.
     // 3. Header struct defined above.
-    // 4. An array of offsets to effect keys and their sizes (see 5). uint16_t for each
-    //    offset and size.
-    // 5. per-effect keys. Each effect's key is a variable length array of uint32_t.
+    // 5. per-effect keys and key length pairs.

[bsalomon, 2014/11/26 15:25:06]

Hmm....

+    //    Each effect's key is a variable length array of uint32_t.
     enum {
         // Part 3.
         kHeaderOffset = GrProgramDesc::kHeaderOffset,
         kHeaderSize = SkAlign4(sizeof(GLKeyHeader)),
         // Part 4.
-        // This is the offset in the overall key to the array of per-effect offset,length pairs.
-        kProcessorKeyOffsetsAndLengthOffset = kHeaderOffset + kHeaderSize,
+        // This is the offset in the overall key to the array of effect keys.

[bsalomon, 2014/11/26 15:25:06]

can we just say "to the effect keys". "Array" is slightly misleading.

Actually, this should probably be the offset to the backend-specific part of the
key, which include per-processor keys. Similar updates to the enumerated list
above.

+        kProcessorKeysOffset = kHeaderOffset + kHeaderSize,
     };
 
     /**
@@ -67,14 +66,6 @@ public:
     static const GLKeyHeader& GetHeader(const GrProgramDesc& desc) {
         return *desc.atOffset<GLKeyHeader, kHeaderOffset>();
     }
-
-private:
-    template <class ProcessorKeyBuilder>
-    static bool BuildStagedProcessorKey(const typename ProcessorKeyBuilder::StagedProcessor& stage,
-                                        const GrGLCaps& caps,
-                                        bool requiresLocalCoordAttrib,
-                                        GrProgramDesc* desc,
-                                        int* offsetAndSizeIndex);
 };
 
 #endif