Refactoring the GrGpuGLShaders2 into 2 classes: GrGpuGLShaders

and GrGLProgram.  The change also contains stubs and placeholders for GrEffect
(work in progress), which will extend shader and rendering capabilities in
Ganesh.  The hash keys for the program cache table have been modified to be able
to accomodate variable-length keys, which will be required for GrEffect support.

Code review: http://codereview.appspot.com/4309045/



git-svn-id: http://skia.googlecode.com/svn/trunk@1031 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 2 insertions, 0 deletions

diff --git a/gpu/include/GrDrawTarget.h b/gpu/include/GrDrawTarget.h
index 35f912b7c4..33469a38a9 100644
--- a/gpu/include/GrDrawTarget.h
+++ b/gpu/include/GrDrawTarget.h
@@ -30,6 +30,7 @@ class GrTexture;
 class GrClipIterator;
 class GrVertexBuffer;
 class GrIndexBuffer;
+class GrEffect;
 
 class GrDrawTarget : public GrRefCnt {
 public:
@@ -138,6 +139,7 @@ protected:
         GrBlendCoeff            fDstBlend;
         GrColor                 fBlendConstant;
         GrTexture*              fTextures[kNumStages];
+        GrEffect*               fEffects[kNumStages];
         GrSamplerState          fSamplerStates[kNumStages];
         GrRenderTarget*         fRenderTarget;
         GrColor                 fColor;