Opt state takes a GP instead of a GeometryStage

src/gpu/gl/GrGLProgramDesc.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gl/builders/GrGLFragmentShaderBuilder.h"
 #include "GrGLProgramDesc.h"
 #include "GrBackendProcessorFactory.h"
@@ skipping 55 matching lines @@
     const GrGeometryProcessor::VertexAttribArray& vars = effect->getVertexAttribs();
     int numAttributes = vars.count();
     SkASSERT(numAttributes <= 2);
     for (int a = 0; a < numAttributes; ++a) {
         uint32_t value = 1 << a;
         key |= value;
     }
     return key;
 }
 
-static uint32_t gen_transform_key(const GrProcessorStage& effectStage,
+static uint32_t gen_transform_key(const GrFragmentStage& effectStage,
                                   bool useExplicitLocalCoords) {
     uint32_t totalKey = 0;
     int numTransforms = effectStage.getProcessor()->numTransforms();
     for (int t = 0; t < numTransforms; ++t) {
         uint32_t key = 0;
         if (effectStage.isPerspectiveCoordTransform(t, useExplicitLocalCoords)) {
             key |= kGeneral_MatrixType;
         } else {
             key |= kNoPersp_MatrixType;
         }
@@ skipping 16 matching lines @@
         const GrTextureAccess& access = effect->textureAccess(t);
         uint32_t configComponentMask = GrPixelConfigComponentMask(access.getTexture()->config());
         if (swizzle_requires_alpha_remapping(caps, configComponentMask, access.swizzleMask())) {
             key |= 1 << t;
         }
     }
     return key;
 }
 
 /**
  * A function which emits a meta key into the key builder.  This is required because shader code may

[bsalomon, 2014/10/09 18:35:45]

This comment needs some rework with this change. Maybe move the meta-key
discussion down to where you moved the code? Or have a get_fp_meta_key()
function? Or get_processor_meta_key() which is common to the gp & fp and called
by get_fp_meta_key()? The meta key stuff is kind of confusing and there are
hardcoded shift values... it'd be nice not to have it repeated and not near its
docs.

  * be dependent on properties of the effect that the effect itself doesn't use
  * in its key (e.g. the pixel format of textures used). So we create a meta-key for
  * every effect using this function. It is also responsible for inserting the effect's class ID
  * which must be different for every GrProcessor subclass. It can fail if an effect uses too many
  * textures, transforms, etc, for the space allotted in the meta-key.
  */
-
-static uint32_t* get_processor_meta_key(const GrProcessorStage& processorStage,
-                                        bool useExplicitLocalCoords,
-                                        const GrGLCaps& caps,
-                                        GrProcessorKeyBuilder* b) {
-
-    uint32_t textureKey = gen_texture_key(processorStage.getProcessor(), caps);
-    uint32_t transformKey = gen_transform_key(processorStage,useExplicitLocalCoords);
-    uint32_t classID = processorStage.getProcessor()->getFactory().effectClassID();
-
-    // Currently we allow 16 bits for each of the above portions of the meta-key. Fail if they
-    // don't fit.
-    static const uint32_t kMetaKeyInvalidMask = ~((uint32_t) SK_MaxU16);
-    if ((textureKey | transformKey | classID) & kMetaKeyInvalidMask) {
-        return NULL;
-    }
-
-    uint32_t* key = b->add32n(2);
-    key[0] = (textureKey << 16 | transformKey);
-    key[1] = (classID << 16);
-    return key;
-}
-
-static bool get_fp_key(const GrProcessorStage& stage,
+static bool get_fp_key(const GrFragmentStage& stage,
                        const GrGLCaps& caps,
                        bool useExplicitLocalCoords,
                        GrProcessorKeyBuilder* b,
                        uint16_t* processorKeySize) {
     const GrProcessor& effect = *stage.getProcessor();
     const GrBackendProcessorFactory& factory = effect.getFactory();
     factory.getGLProcessorKey(effect, caps, b);
     size_t size = b->size();
     if (size > SK_MaxU16) {
         *processorKeySize = 0; // suppresses a warning.
         return false;
     }
     *processorKeySize = SkToU16(size);
-    if (NULL == get_processor_meta_key(stage, useExplicitLocalCoords, caps, b)) {
+    uint32_t textureKey = gen_texture_key(stage.getProcessor(), caps);
+    uint32_t transformKey = gen_transform_key(stage, useExplicitLocalCoords);
+    uint32_t classID = stage.getProcessor()->getFactory().effectClassID();
+
+    // Currently we allow 16 bits for each of the above portions of the meta-key. Fail if they
+    // don't fit.
+    static const uint32_t kMetaKeyInvalidMask = ~((uint32_t) SK_MaxU16);
+    if ((textureKey | transformKey | classID) & kMetaKeyInvalidMask) {
         return false;
     }
+
+    uint32_t* key = b->add32n(2);
+    key[0] = (textureKey << 16 | transformKey);
+    key[1] = (classID << 16);
     return true;
 }
 
-static bool get_gp_key(const GrGeometryStage& stage,
+static bool get_gp_key(const GrGeometryProcessor& gp,
                        const GrGLCaps& caps,
                        bool useExplicitLocalCoords,
                        GrProcessorKeyBuilder* b,
                        uint16_t* processorKeySize) {
-    const GrProcessor& effect = *stage.getProcessor();
-    const GrBackendProcessorFactory& factory = effect.getFactory();
-    factory.getGLProcessorKey(effect, caps, b);
+    const GrBackendProcessorFactory& factory = gp.getFactory();
+    factory.getGLProcessorKey(gp, caps, b);
     size_t size = b->size();
     if (size > SK_MaxU16) {
         *processorKeySize = 0; // suppresses a warning.
         return false;
     }
     *processorKeySize = SkToU16(size);
-    uint32_t* key = get_processor_meta_key(stage, useExplicitLocalCoords, caps, b);
-    if (NULL == key) {
-        return false;
-    }
-    uint32_t attribKey = gen_attrib_key(stage.getProcessor());
+    uint32_t textureKey = gen_texture_key(&gp, caps);
+    uint32_t attribKey = gen_attrib_key(&gp);
+    uint32_t classID = gp.getFactory().effectClassID();
 
     // Currently we allow 16 bits for each of the above portions of the meta-key. Fail if they
     // don't fit.
     static const uint32_t kMetaKeyInvalidMask = ~((uint32_t) SK_MaxU16);
-    if ((attribKey) & kMetaKeyInvalidMask) {
-       return false;
+    if ((textureKey | attribKey | classID) & kMetaKeyInvalidMask) {
+        return false;
     }
 
-    key[1] |= attribKey;
+    uint32_t* key = b->add32n(2);
+    key[0] = (textureKey << 16);
+    key[1] = (classID << 16 | attribKey);
     return true;
 }
 
 struct GeometryProcessorKeyBuilder {
-    typedef GrGeometryStage StagedProcessor;
-    static bool GetProcessorKey(const GrGeometryStage& gpStage,
+    typedef GrGeometryProcessor StagedProcessor;
+    static bool GetProcessorKey(const GrGeometryProcessor& gpStage,
                                 const GrGLCaps& caps,
                                 bool requiresLocalCoordAttrib,
                                 GrProcessorKeyBuilder* b,
                                 uint16_t* processorKeySize) {
         return get_gp_key(gpStage, caps, requiresLocalCoordAttrib, b, processorKeySize);
     }
 };
 
 struct FragmentProcessorKeyBuilder {
     typedef GrFragmentStage StagedProcessor;
@@ skipping 28 matching lines @@
             reinterpret_cast<uint16_t*>(desc->fKey.begin() + kEffectKeyOffsetsAndLengthOffset +
                                         *offsetAndSizeIndex * 2 * sizeof(uint16_t));
     offsetAndSize[0] = SkToU16(processorOffset);
     offsetAndSize[1] = processorKeySize;
     ++(*offsetAndSizeIndex);
     return true;
 }
 
 bool GrGLProgramDesc::Build(const GrOptDrawState& optState,
                             GrGpu::DrawType drawType,
-                            GrBlendCoeff srcCoeff,
-                            GrBlendCoeff dstCoeff,
                             GrGpuGL* gpu,
                             const GrDeviceCoordTexture* dstCopy,
-                            const GrGeometryStage** geometryProcessor,
-                            SkTArray<const GrFragmentStage*, true>* colorStages,
-                            SkTArray<const GrFragmentStage*, true>* coverageStages,
                             GrGLProgramDesc* desc) {
-    colorStages->reset();
-    coverageStages->reset();
-
     bool inputColorIsUsed = optState.inputColorIsUsed();
     bool inputCoverageIsUsed = optState.inputCoverageIsUsed();
 
     // The descriptor is used as a cache key. Thus when a field of the
     // descriptor will not affect program generation (because of the attribute
     // bindings in use or other descriptor field settings) it should be set
     // to a canonical value to avoid duplicate programs with different keys.
 
     bool requiresLocalCoordAttrib = optState.requiresLocalCoordAttrib();
 
     int numStages = optState.numTotalStages();
 
     GR_STATIC_ASSERT(0 == kEffectKeyOffsetsAndLengthOffset % sizeof(uint32_t));
     // Make room for everything up to and including the array of offsets to effect keys.
     desc->fKey.reset();
     desc->fKey.push_back_n(kEffectKeyOffsetsAndLengthOffset + 2 * sizeof(uint16_t) * numStages);
 
     int offsetAndSizeIndex = 0;
 
     // We can only have one effect which touches the vertex shader
     if (optState.hasGeometryProcessor()) {
-        const GrGeometryStage& gpStage = *optState.getGeometryProcessor();
-        if (!BuildStagedProcessorKey<GeometryProcessorKeyBuilder>(gpStage,
+        if (!BuildStagedProcessorKey<GeometryProcessorKeyBuilder>(*optState.getGeometryProcessor(),
                                                                   gpu->glCaps(),
                                                                   requiresLocalCoordAttrib,
                                                                   desc,
                                                                   &offsetAndSizeIndex)) {
             return false;
         }
-        *geometryProcessor = &gpStage;
     }
 
     for (int s = 0; s < optState.numColorStages(); ++s) {
         if (!BuildStagedProcessorKey<FragmentProcessorKeyBuilder>(optState.getColorStage(s),
                                                                   gpu->glCaps(),
                                                                   requiresLocalCoordAttrib,
                                                                   desc,
                                                                   &offsetAndSizeIndex)) {
             return false;
         }
@@ skipping 96 matching lines @@
     } else if (GrGLProgramDesc::kAttribute_ColorInput == header->fCoverageInput) {
         SkASSERT(availableAttributeIndex < GrDrawState::kMaxVertexAttribCnt);
         header->fCoverageAttributeIndex = availableAttributeIndex;
     } else {
         header->fCoverageAttributeIndex = -1;
     }
 
     header->fPrimaryOutputType = optState.getPrimaryOutputType();
     header->fSecondaryOutputType = optState.getSecondaryOutputType();
 
-    for (int s = 0; s < optState.numColorStages(); ++s) {
-        colorStages->push_back(&optState.getColorStage(s));
-    }
-    for (int s = 0; s < optState.numCoverageStages(); ++s) {
-        coverageStages->push_back(&optState.getCoverageStage(s));
-    }
-
-    header->fColorEffectCnt = colorStages->count();
-    header->fCoverageEffectCnt = coverageStages->count();
+    header->fColorEffectCnt = optState.numColorStages();
+    header->fCoverageEffectCnt = optState.numCoverageStages();
     desc->finalize();
     return true;
 }
 
 void GrGLProgramDesc::finalize() {
     int keyLength = fKey.count();
     SkASSERT(0 == (keyLength % 4));
     *this->atOffset<uint32_t, kLengthOffset>() = SkToU32(keyLength);
 
     uint32_t* checksum = this->atOffset<uint32_t, kChecksumOffset>();
     *checksum = 0;
     *checksum = SkChecksum::Compute(reinterpret_cast<uint32_t*>(fKey.begin()), keyLength);
 }
 
 GrGLProgramDesc& GrGLProgramDesc::operator= (const GrGLProgramDesc& other) {
     size_t keyLength = other.keyLength();
     fKey.reset(keyLength);
     memcpy(fKey.begin(), other.fKey.begin(), keyLength);
     return *this;
 }