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/GrAtlas.cpp

diff --git a/src/gpu/GrAtlas.cpp b/src/gpu/GrAtlas.cpp
index 9553cf2..f8586fa 100644
--- a/src/gpu/GrAtlas.cpp
+++ b/src/gpu/GrAtlas.cpp
@@ -182,7 +182,7 @@
             GR_ATLAS_TEXTURE_WIDTH,
             GR_ATLAS_TEXTURE_HEIGHT,
             maskformat2pixelconfig(format),
-            {0} // samples
+            0 // samples
         };
         fTexture[format] = fGpu->createTexture(desc, NULL, 0);
         if (NULL == fTexture[format]) {

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);

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 5f9879e..e13a0ea 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -230,7 +230,7 @@
         width,
         height,
         SkGr::Bitmap2PixelConfig(bm),
-        {0} // samples
+        0 // samples
     };
 
     fTexture = fContext->createUncachedTexture(desc, NULL, 0);
@@ -801,7 +801,7 @@
         // We actually only need A8, but it often isn't supported as a
         // render target
         kRGBA_8888_PM_GrPixelConfig,
-        {0} // samples
+        0 // samples
     };
 
     GrAutoScratchTexture pathEntry(context, desc);
@@ -932,7 +932,7 @@
         dstM.fBounds.width(),
         dstM.fBounds.height(),
         kAlpha_8_GrPixelConfig,
-        {0}, // samples
+        0, // samples
     };
 
     GrAutoScratchTexture ast(context, desc);
@@ -1436,7 +1436,7 @@
         rect.width(),
         rect.height(),
         kRGBA_8888_PM_GrPixelConfig,
-        {0} // samples
+        0 // samples
     };
 
     if (filter->asABlur(&blurSize)) {
@@ -1826,7 +1826,7 @@
             bitmap.width(),
             bitmap.height(),
             SkGr::Bitmap2PixelConfig(bitmap),
-            {0} // samples
+            0 // samples
         };
         GrContext::ScratchTexMatch match;
         if (kSaveLayerDeviceRenderTarget_TexType == type) {

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 519475c..ba98e06 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -76,7 +76,7 @@
         bitmap->width(),
         bitmap->height(),
         SkGr::Bitmap2PixelConfig(*bitmap),
-        {0} // samples
+        0 // samples
     };
 
     if (SkBitmap::kIndex8_Config == bitmap->config()) {

src/gpu/gl/GrGpuGL.cpp

diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 8754ac3..8214b6e 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -319,7 +319,7 @@
                          kNoStencil_GrTextureFlagBit;
         dstDesc.fWidth = 256;
         dstDesc.fHeight = 256;
-        dstDesc.fConfig = kRGBA_8888_GrPixelConfig;
+        dstDesc.fConfig = kRGBA_8888_PM_GrPixelConfig;
         dstDesc.fSampleCnt = 0;
 
         SkAutoTUnref<GrTexture> dstTex(this->createTexture(dstDesc, NULL, 0));