OptState owns program descriptor

src/gpu/GrGpu.h

Index: src/gpu/GrGpu.h
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index e4669a25c506fa30baee1349a9d86b1822186ce8..a362413cf7d5d5f21527a78b689ac2afcc14984f 100644
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -9,6 +9,7 @@
 #define GrGpu_DEFINED
 
 #include "GrDrawTarget.h"
+#include "GrProgramDesc.h"

[egdaniel, 2014/10/24 14:59:30]

alphabetize 

[joshualitt, 2014/10/24 15:15:38]

Acknowledged.

 #include "GrClipMaskManager.h"
 #include "GrPathRendering.h"
 #include "SkPath.h"
@@ -348,6 +349,12 @@ public:
 
     GrContext::GPUStats* gpuStats() { return &fGPUStats; }
 
+    virtual void buildProgramDesc(const GrOptDrawState*,

[egdaniel, 2014/10/24 14:59:30]

make this const GrOptDrawState&? ODS will never be NULL (func is only called
within ODS), and the function doesn't need to hold on to ODS as far as I can
tell.

[joshualitt, 2014/10/24 15:15:38]

GrOptDrawState.h includes GrGpu.h

+                                  const GrProgramDesc::DescInfo&,
+                                  GrGpu::DrawType,
+                                  const GrDeviceCoordTexture* dstCopy,
+                                  GrProgramDesc*) = 0;
+
 protected:
     DrawType PrimTypeToDrawType(GrPrimitiveType type) {
         switch (type) {