Add reset context count to GrGpu

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

src/gpu/GrGpu.cpp

@@ -32,6 +32,7 @@ extern void gr_run_unittests();
 
 GrGpu::GrGpu()
     : fContext(NULL)
+    , fResetCnt(0)
     , fVertexPool(NULL)
     , fIndexPool(NULL)
     , fVertexPoolUseCnt(0)
@@ -61,6 +62,11 @@ GrGpu::~GrGpu() {
     this->releaseResources();
 }
 
+void GrGpu::resetContext() {
+    this->onResetContext();
+    ++fResetCnt;
+}
+
 void GrGpu::abandonResources() {
 
     while (NULL != fResourceHead) {

src/gpu/GrGpu.h

@@ -288,9 +288,14 @@ protected:
     void finalizeReservedVertices();
     void finalizeReservedIndices();
 
-    // overridden by API-specific derived class to handle re-emitting 3D API
+    // called to handle re-emitting 3D API preample and dirtying state cache.
-    // preample and dirtying state cache.
+    void resetContext();
-    virtual void resetContext() = 0;
+    // returns the number of times resetContext has been called. This value
+    // can be used a timestamp to detect when state cache is dirty.
+    int resetCount() const { return fResetCnt; }
+    
+    // subclass implementation of resetContext
+    virtual void onResetContext() = 0;
 
     // overridden by API-specific derived class to create objects.
     virtual GrTexture* onCreateTexture(const GrTextureDesc& desc,
@@ -363,6 +368,8 @@ protected:
 
 private:
     GrContext*                  fContext; // not reffed (context refs gpu)
+    
+    int                         fResetCnt;
 
     GrVertexBufferAllocPool*    fVertexPool;
 

src/gpu/GrGpuGL.cpp

@@ -559,7 +559,7 @@ void GrGpuGL::initStencilFormats() {
     }
 }
 
-void GrGpuGL::resetContext() {
+void GrGpuGL::onResetContext() {
     if (gPrintStartupSpew && !fPrintedCaps) {
         fPrintedCaps = true;
         this->getCaps().print();

src/gpu/GrGpuGL.h

@@ -70,7 +70,7 @@ protected:
     } fHWBounds;
 
     // GrGpu overrides
-    virtual void resetContext();
+    virtual void onResetContext() SK_OVERRIDE;
 
     virtual GrTexture* onCreateTexture(const GrTextureDesc& desc,
                                        const void* srcData,

src/gpu/GrGpuGLFixed.cpp

@@ -67,8 +67,8 @@ GrGpuGLFixed::GrGpuGLFixed(const GrGLInterface* gl)
 GrGpuGLFixed::~GrGpuGLFixed() {
 }
 
-void GrGpuGLFixed::resetContext() {
+void GrGpuGLFixed::onResetContext() {
-    INHERITED::resetContext();
+    INHERITED::onResetContext();
 
     GL_CALL(Disable(GR_GL_TEXTURE_2D));
 

src/gpu/GrGpuGLFixed.h

@@ -29,7 +29,7 @@ protected:
                                int indexCount);
 
 private:
-    virtual void resetContext();
+    virtual void onResetContext() SK_OVERRIDE;
 
     // Helpers to make code more readable
     const GrMatrix& getHWSamplerMatrix(int stage) const {

src/gpu/GrGpuGLShaders.cpp

@@ -360,8 +360,8 @@ void GrGpuGLShaders::recordHWSamplerMatrix(int stage, const GrMatrix& matrix) {
     }
 }
 
-void GrGpuGLShaders::resetContext() {
+void GrGpuGLShaders::onResetContext() {
-    INHERITED::resetContext();
+    INHERITED::onResetContext();
 
     fHWGeometryState.fVertexOffset = ~0;
 

src/gpu/GrGpuGLShaders.h

@@ -22,14 +22,13 @@ public:
              GrGpuGLShaders(const GrGLInterface* glInterface);
     virtual ~GrGpuGLShaders();
 
-    virtual void resetContext();
-
     virtual void abandonResources();
 
     bool programUnitTest();
 
 protected:
     // overrides from GrGpu
+    virtual void onResetContext() SK_OVERRIDE;
     virtual bool flushGraphicsState(GrPrimitiveType type);
     virtual void setupGeometry(int* startVertex,
                                int* startIndex,