commit b9014f4f2e6e2bb13f63006cecf34b848d95b0f3
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 30 14:22:41 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 30 14:22:41 2012 +0000
tree b4cfd017eb509bcf1c8c8c06d565416d66df62a4
parent 4cccc6b224cc37c99a3101893f645b7af776287e

Remove deprecated names from Gr (WK is no longer using them)

Review URL: http://codereview.appspot.com/5969046/



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

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 64ae1a5..2cc460a 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1394,7 +1394,7 @@
         bounds.fRight,
         bounds.fBottom,
         kAlpha_8_GrPixelConfig,
-        {0} // samples
+        0 // samples
     };
 
     tex->set(context, desc);
@@ -1705,7 +1705,7 @@
             kRenderTarget_GrTextureFlagBit,
             width, height,
             config,
-            {0}, // samples
+            0 // samples
         };
 
         // When a full readback is faster than a partial we could always make
@@ -1855,7 +1855,7 @@
     }
 
     const GrTextureDesc desc = {
-        kNone_GrTextureFlags, width, height, config, {0}
+        kNone_GrTextureFlags, width, height, config, 0
     };
     GrAutoScratchTexture ast(this, desc);
     GrTexture* texture = ast.texture();
@@ -2133,8 +2133,8 @@
         kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit,
         SkScalarFloorToInt(srcRect.width()),
         SkScalarFloorToInt(srcRect.height()),
-        kRGBA_8888_GrPixelConfig,
-        {0} // samples 
+        kRGBA_8888_PM_GrPixelConfig,
+        0 // samples 
     };
 
     temp1->set(this, desc);