revert 9802 breacking tests on some configs

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

diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index 280b8cc..5c796b2 100644 (file)
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -61,10 +61,8 @@ public:
      * within the underlying 3D API's context/device/whatever. This call informs
      * the context that the state was modified and it should resend. Shouldn't
      * be called frequently for good performance.
-     * The flag bits, state, is dpendent on which backend is used by the
-     * context, either GL or D3D (possible in future).
      */
-    void resetContext(uint32_t state = kALL_GrGLBackendState);
+    void resetContext();
 
     /**
      * Callback function to allow classes to cleanup on GrContext destruction.

diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h
index e6114de..970e0c7 100644 (file)
--- a/include/gpu/GrTypes.h
+++ b/include/gpu/GrTypes.h
@@ -600,25 +600,6 @@ struct GrBackendRenderTargetDesc {
     GrBackendObject                 fRenderTargetHandle;
 };
 
-/**
- * The GrContext's cache of backend context state can be partially invalidated.
- * These enums are specific to the GL backend and we'd add a new set for an alternative backend.
- */
-enum GrGLBackendState {
-    kRenderTarget_GrGLBackendState     = 1 << 0,
-    kTextureBinding_GrGLBackendState   = 1 << 1,
-    // View state stands for scissor and viewport
-    kView_GrGLBackendState             = 1 << 2,
-    kBlend_GrGLBackendState            = 1 << 3,
-    kAA_GrGLBackendState               = 1 << 4,
-    kVertex_GrGLBackendState           = 1 << 5,
-    kStencil_GrGLBackendState          = 1 << 6,
-    kPixelStore_GrGLBackendState       = 1 << 7,
-    kProgram_GrGLBackendState          = 1 << 8,
-    kPathStencil_GrGLBackendState      = 1 << 9,
-    kMisc_GrGLBackendState             = 1 << 10,
-    kALL_GrGLBackendState              = 0xffff
-};
 ///////////////////////////////////////////////////////////////////////////////
 
 #endif

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index fe8f4fd..c94c1a9 100644 (file)
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -204,8 +204,8 @@ void GrContext::contextDestroyed() {
     fGpu->markContextDirty();
 }
 
-void GrContext::resetContext(uint32_t state) {
-    fGpu->markContextDirty(state);
+void GrContext::resetContext() {
+    fGpu->markContextDirty();
 }
 
 void GrContext::freeGpuResources() {

diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index 6b4cb53..3acfac2 100644 (file)
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -66,10 +66,7 @@ public:
      * the GrGpu that the state was modified and it shouldn't make assumptions
      * about the state.
      */
-    void markContextDirty(uint32_t state = kALL_GrGLBackendState) {
-        fContextIsDirty = true;
-        fResetBits |= state;
-    }
+    void markContextDirty() { fContextIsDirty = true; }
 
     void unimpl(const char[]);
 
@@ -429,7 +426,7 @@ private:
 
     // called when the 3D context state is unknown. Subclass should emit any
     // assumed 3D context state and dirty any state cache.
-    virtual void onResetContext(uint32_t resetBits) = 0;
+    virtual void onResetContext() = 0;
 
     // overridden by backend-specific derived class to create objects.
     virtual GrTexture* onCreateTexture(const GrTextureDesc& desc,
@@ -510,8 +507,7 @@ private:
         // stencil buffer. Perhaps we should detect whether it is a
         // internally created stencil buffer and if so skip the invalidate.
         fClipMaskManager.invalidateStencilMask();
-        this->onResetContext(fResetBits);
-        fResetBits = 0;
+        this->onResetContext();
         ++fResetTimestamp;
     }
 
@@ -536,7 +532,6 @@ private:
     // these are mutable so they can be created on-demand
     mutable GrIndexBuffer*                                              fQuadIndexBuffer;
     bool                                                                fContextIsDirty;
-    uint32_t                                                            fResetBits;
     // Used to abandon/release all resources created by this GrGpu. TODO: Move this
     // functionality to GrResourceCache.
     ResourceList                                                        fResourceList;

diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 51e3717..d96ea39 100644 (file)
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -282,110 +282,88 @@ bool GrGpuGL::fullReadPixelsIsFasterThanPartial() const {
     return SkToBool(GR_GL_FULL_READPIXELS_FASTER_THAN_PARTIAL);
 }
 
-void GrGpuGL::onResetContext(uint32_t resetBits) {
+void GrGpuGL::onResetContext() {
 
     // we don't use the zb at all
-    if (resetBits & kMisc_GrGLBackendState) {
-        GL_CALL(Disable(GR_GL_DEPTH_TEST));
-        GL_CALL(DepthMask(GR_GL_FALSE));
-
-        fHWDrawFace = GrDrawState::kInvalid_DrawFace;
-        fHWDitherEnabled = kUnknown_TriState;
-
-        if (kDesktop_GrGLBinding == this->glBinding()) {
-            // Desktop-only state that we never change
-            if (!this->glCaps().isCoreProfile()) {
-                GL_CALL(Disable(GR_GL_POINT_SMOOTH));
-                GL_CALL(Disable(GR_GL_LINE_SMOOTH));
-                GL_CALL(Disable(GR_GL_POLYGON_SMOOTH));
-                GL_CALL(Disable(GR_GL_POLYGON_STIPPLE));
-                GL_CALL(Disable(GR_GL_COLOR_LOGIC_OP));
-                GL_CALL(Disable(GR_GL_INDEX_LOGIC_OP));
-            }
-            // The windows NVIDIA driver has GL_ARB_imaging in the extension string when using a
-            // core profile. This seems like a bug since the core spec removes any mention of
-            // GL_ARB_imaging.
-            if (this->glCaps().imagingSupport() && !this->glCaps().isCoreProfile()) {
-                GL_CALL(Disable(GR_GL_COLOR_TABLE));
-            }
-            GL_CALL(Disable(GR_GL_POLYGON_OFFSET_FILL));
-            // Since ES doesn't support glPointSize at all we always use the VS to
-            // set the point size
-            GL_CALL(Enable(GR_GL_VERTEX_PROGRAM_POINT_SIZE));
-
-            // We should set glPolygonMode(FRONT_AND_BACK,FILL) here, too. It isn't
-            // currently part of our gl interface. There are probably others as
-            // well.
+    GL_CALL(Disable(GR_GL_DEPTH_TEST));
+    GL_CALL(DepthMask(GR_GL_FALSE));
+
+    fHWDrawFace = GrDrawState::kInvalid_DrawFace;
+    fHWDitherEnabled = kUnknown_TriState;
+
+    if (kDesktop_GrGLBinding == this->glBinding()) {
+        // Desktop-only state that we never change
+        if (!this->glCaps().isCoreProfile()) {
+            GL_CALL(Disable(GR_GL_POINT_SMOOTH));
+            GL_CALL(Disable(GR_GL_LINE_SMOOTH));
+            GL_CALL(Disable(GR_GL_POLYGON_SMOOTH));
+            GL_CALL(Disable(GR_GL_POLYGON_STIPPLE));
+            GL_CALL(Disable(GR_GL_COLOR_LOGIC_OP));
+            GL_CALL(Disable(GR_GL_INDEX_LOGIC_OP));
         }
-        fHWWriteToColor = kUnknown_TriState;
-        // we only ever use lines in hairline mode
-        GL_CALL(LineWidth(1));
-    }
+        // The windows NVIDIA driver has GL_ARB_imaging in the extension string when using a core
+        // profile. This seems like a bug since the core spec removes any mention of GL_ARB_imaging.
+        if (this->glCaps().imagingSupport() && !this->glCaps().isCoreProfile()) {
+            GL_CALL(Disable(GR_GL_COLOR_TABLE));
+        }
+        GL_CALL(Disable(GR_GL_POLYGON_OFFSET_FILL));
+        // Since ES doesn't support glPointSize at all we always use the VS to
+        // set the point size
+        GL_CALL(Enable(GR_GL_VERTEX_PROGRAM_POINT_SIZE));
 
-    if (resetBits & kAA_GrGLBackendState) {
-        fHWAAState.invalidate();
+        // We should set glPolygonMode(FRONT_AND_BACK,FILL) here, too. It isn't
+        // currently part of our gl interface. There are probably others as
+        // well.
     }
+    fHWAAState.invalidate();
+    fHWWriteToColor = kUnknown_TriState;
+
+    // we only ever use lines in hairline mode
+    GL_CALL(LineWidth(1));
 
     // invalid
-    if (resetBits & kTextureBinding_GrGLBackendState) {
-        fHWActiveTextureUnitIdx = -1;
-        for (int s = 0; s < fHWBoundTextures.count(); ++s) {
-            fHWBoundTextures[s] = NULL;
-        }
-    }
+    fHWActiveTextureUnitIdx = -1;
 
-    if (resetBits & kBlend_GrGLBackendState) {
-        fHWBlendState.invalidate();
-    }
+    fHWBlendState.invalidate();
 
-    if (resetBits & kView_GrGLBackendState) {
-        fHWScissorSettings.invalidate();
-        fHWViewport.invalidate();
+    for (int s = 0; s < fHWBoundTextures.count(); ++s) {
+        fHWBoundTextures[s] = NULL;
     }
 
-    if (resetBits & kStencil_GrGLBackendState) {
-        fHWStencilSettings.invalidate();
-        fHWStencilTestEnabled = kUnknown_TriState;
-    }
+    fHWScissorSettings.invalidate();
 
-    // Vertex
-    if (resetBits & kVertex_GrGLBackendState) {
-        fHWGeometryState.invalidate();
-    }
+    fHWViewport.invalidate();
 
-    if (resetBits & kRenderTarget_GrGLBackendState) {
-        fHWBoundRenderTarget = NULL;
-    }
+    fHWStencilSettings.invalidate();
+    fHWStencilTestEnabled = kUnknown_TriState;
 
-    if (resetBits & kPathStencil_GrGLBackendState) {
-        fHWPathStencilMatrixState.invalidate();
-        if (this->caps()->pathStencilingSupport()) {
-            // we don't use the model view matrix.
-            GL_CALL(MatrixMode(GR_GL_MODELVIEW));
-            GL_CALL(LoadIdentity());
-        }
+    fHWGeometryState.invalidate();
+
+    fHWBoundRenderTarget = NULL;
+
+    fHWPathStencilMatrixState.invalidate();
+    if (this->caps()->pathStencilingSupport()) {
+        // we don't use the model view matrix.
+        GL_CALL(MatrixMode(GR_GL_MODELVIEW));
+        GL_CALL(LoadIdentity());
     }
 
     // we assume these values
-    if (resetBits & kPixelStore_GrGLBackendState) {
-        if (this->glCaps().unpackRowLengthSupport()) {
-            GL_CALL(PixelStorei(GR_GL_UNPACK_ROW_LENGTH, 0));
-        }
-        if (this->glCaps().packRowLengthSupport()) {
-            GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH, 0));
-        }
-        if (this->glCaps().unpackFlipYSupport()) {
-            GL_CALL(PixelStorei(GR_GL_UNPACK_FLIP_Y, GR_GL_FALSE));
-        }
-        if (this->glCaps().packFlipYSupport()) {
-            GL_CALL(PixelStorei(GR_GL_PACK_REVERSE_ROW_ORDER, GR_GL_FALSE));
-        }
+    if (this->glCaps().unpackRowLengthSupport()) {
+        GL_CALL(PixelStorei(GR_GL_UNPACK_ROW_LENGTH, 0));
     }
-
-    if (resetBits & kProgram_GrGLBackendState) {
-        fHWProgramID = 0;
-        fSharedGLProgramState.invalidate();
+    if (this->glCaps().packRowLengthSupport()) {
+        GL_CALL(PixelStorei(GR_GL_PACK_ROW_LENGTH, 0));
     }
+    if (this->glCaps().unpackFlipYSupport()) {
+        GL_CALL(PixelStorei(GR_GL_UNPACK_FLIP_Y, GR_GL_FALSE));
+    }
+    if (this->glCaps().packFlipYSupport()) {
+        GL_CALL(PixelStorei(GR_GL_PACK_REVERSE_ROW_ORDER, GR_GL_FALSE));
+    }
+
+    fHWProgramID = 0;
+    fSharedGLProgramState.invalidate();
 }
 
 namespace {

diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 38e5842..c644fbb 100644 (file)
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -102,7 +102,7 @@ protected:
 
 private:
     // GrGpu overrides
-    virtual void onResetContext(uint32_t resetBits) SK_OVERRIDE;
+    virtual void onResetContext() SK_OVERRIDE;
 
     virtual GrTexture* onCreateTexture(const GrTextureDesc& desc,
                                        const void* srcData,