Revert r2872
git-svn-id: http://skia.googlecode.com/svn/trunk@2873 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrGpuGL.h b/src/gpu/GrGpuGL.h
index 323d5f6..5f9180f 100644
--- a/src/gpu/GrGpuGL.h
+++ b/src/gpu/GrGpuGL.h
@@ -41,6 +41,8 @@
GrPixelConfig config,
size_t rowBytes) const SK_OVERRIDE;
virtual bool fullReadPixelsIsFasterThanPartial() const SK_OVERRIDE;
+protected:
+ GrGpuGL(const GrGLInterface* glInterface, GrGLBinding glBinding);
struct GLCaps {
GLCaps()
@@ -116,19 +118,8 @@
bool fTextureUsageSupport;
void print() const;
- };
-
- const GLCaps& glCaps() const { return fGLCaps; }
-
- // subclass may try to take advantage of identity tex matrices.
- // This helper determines if matrix will be identity after all
- // adjustments are applied.
- static bool TextureMatrixIsIdentity(const GrGLTexture* texture,
- const GrSamplerState& sampler);
-
-protected:
- GrGpuGL(const GrGLInterface* glInterface, GrGLBinding glBinding);
-
+ } fGLCaps;
+
struct {
size_t fVertexOffset;
GrVertexLayout fVertexLayout;
@@ -166,6 +157,8 @@
GrGLIRect fViewportRect;
} fHWBounds;
+ const GLCaps& glCaps() const { return fGLCaps; }
+
// GrGpu overrides
virtual void onResetContext() SK_OVERRIDE;
@@ -248,6 +241,13 @@
static void AdjustTextureMatrix(const GrGLTexture* texture,
GrSamplerState::SampleMode mode,
GrMatrix* matrix);
+
+ // subclass may try to take advantage of identity tex matrices.
+ // This helper determines if matrix will be identity after all
+ // adjustments are applied.
+ static bool TextureMatrixIsIdentity(const GrGLTexture* texture,
+ const GrSamplerState& sampler);
+
static bool BlendCoeffReferencesConstant(GrBlendCoeff coeff);
private:
@@ -321,7 +321,6 @@
const GrGLInterface* fGL;
GrGLBinding fGLBinding;
- GLCaps fGLCaps;
bool fPrintedCaps;