Revert r2026 due to bot failures

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

1 files changed, 13 insertions, 19 deletions

diff --git a/gpu/src/GrGpuGL.h b/gpu/src/GrGpuGL.h
index 6dbc9d7dd5..59e32cf5ae 100644
--- a/gpu/src/GrGpuGL.h
+++ b/gpu/src/GrGpuGL.h
@@ -12,11 +12,11 @@
 #define GrGpuGL_DEFINED
 
 #include "GrGpu.h"
-#include "GrGLIndexBuffer.h"
 #include "GrGLIRect.h"
-#include "GrGLStencilBuffer.h"
 #include "GrGLTexture.h"
+
 #include "GrGLVertexBuffer.h"
+#include "GrGLIndexBuffer.h"
 
 #include "SkString.h"
 
@@ -69,9 +69,8 @@ protected:
     } fHWBounds;
 
     // GrGpu overrides
+    // overrides from GrGpu
     virtual void resetContext();
-    virtual void abandonResources();
-    virtual void releaseResources();
 
     virtual GrTexture* onCreateTexture(const GrTextureDesc& desc,
                                        const void* srcData,
@@ -82,10 +81,6 @@ protected:
                                                bool dynamic);
     virtual GrResource* onCreatePlatformSurface(const GrPlatformSurfaceDesc& desc);
     virtual GrRenderTarget* onCreateRenderTargetFrom3DApiState();
-    virtual bool createStencilBufferForRenderTarget(GrRenderTarget* rt,
-                                                    int width, int height);
-    virtual bool attachStencilBufferToRenderTarget(GrStencilBuffer* sb,
-                                                   GrRenderTarget* rt);
 
     virtual void onClear(const GrIRect* rect, GrColor color);
 
@@ -178,16 +173,12 @@ private:
                       GrGLenum* internalFormat,
                       GrGLenum* format,
                       GrGLenum* type);
-    // helpers for onCreateTexture
+    // helper for onCreateTexture
     void allocateAndUploadTexData(const GrGLTexture::Desc& desc,
                                   GrGLenum internalFormat,
                                   const void* data,
                                   size_t rowBytes);
 
-    bool createRenderTargetObjects(int width, int height,
-                                   GrGLuint texID,
-                                   GrGLRenderTarget::Desc* desc);
-
     bool fboInternalFormat(GrPixelConfig config, GrGLenum* format);
 
     friend class GrGLVertexBuffer;
@@ -195,13 +186,16 @@ private:
     friend class GrGLTexture;
     friend class GrGLRenderTarget;
 
+    static const GrGLuint gUNKNOWN_BITCOUNT = ~0;
+
+    struct StencilFormat {
+        GrGLenum  fEnum;
+        GrGLuint  fBits;
+        bool      fPacked;
+    };
+
+    GrTArray<StencilFormat, true> fStencilFormats;
 
-    GrTArray<GrGLStencilBuffer::Format, true> fStencilFormats;
-    // we want to clear stencil buffers when they are created. We want to clear
-    // the entire buffer even if it is larger than the color attachment. We
-    // attach it to this fbo with no color attachment to do the initial clear.
-    GrGLuint fStencilClearFBO;
-    
     bool fHWBlendDisabled;
 
     GrGLuint fAASamples[4];