commit 64c4fe4113424bcfab8b3e0c7049887fda5ab4ff
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Nov 05 14:51:01 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Nov 05 14:51:01 2011 +0000
tree 4f40d3e3a2f5f328aa2bcb5e051a4c804873de00
parent 9d6cfd80a06e5efde1fc865c5e65c0ad27389a3f

More removal of texture fUploadByteCount and rename fFormat to fConfig for consistency.



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

src/gpu/GrGLTexture.h

diff --git a/src/gpu/GrGLTexture.h b/src/gpu/GrGLTexture.h
index 8c35430..49002af 100644
--- a/src/gpu/GrGLTexture.h
+++ b/src/gpu/GrGLTexture.h
@@ -64,11 +64,10 @@
         int             fContentHeight;
         int             fAllocWidth;
         int             fAllocHeight;
-        GrPixelConfig   fFormat;
+        GrPixelConfig   fConfig;
         GrGLuint        fTextureID;
         bool            fOwnsID;
         GrGLenum        fUploadFormat;
-        GrGLenum        fUploadByteCount;
         GrGLenum        fUploadType;
         Orientation     fOrientation;
     };