commit 5bc34f04fe70cdde702ac3bff1fea0ccb275d4a5
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 06 14:46:34 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 06 14:46:34 2011 +0000
tree b6fc46ffc37f860f0d5c67fedcea55977acfa7fb
parent 0be5eb75331050bd095072e6d9a2528af2c6c630

Remove fConfig/fFormat union in GrTextureDesc

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


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

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 54965a6..02a83f2 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -746,7 +746,7 @@
         kNone_GrAALevel,
         srcRect.width(),
         srcRect.height(),
-        { kRGBA_8888_GrPixelConfig }
+        kRGBA_8888_GrPixelConfig
     };
 
     temp1->set(context, desc);
@@ -886,7 +886,7 @@
         srcRect.height(),
         // We actually only need A8, but it often isn't supported as a
         // render target
-        { kRGBA_8888_PM_GrPixelConfig }
+        kRGBA_8888_PM_GrPixelConfig
     };
 
     GrAutoScratchTexture pathEntry(context, desc);
@@ -1017,7 +1017,7 @@
         kNone_GrAALevel,
         dstM.fBounds.width(),
         dstM.fBounds.height(),
-        { kAlpha_8_GrPixelConfig }
+        kAlpha_8_GrPixelConfig
     };
 
     GrAutoScratchTexture ast(context, desc);
@@ -1758,7 +1758,7 @@
             kNone_GrAALevel,
             bitmap.width(),
             bitmap.height(),
-            { SkGr::Bitmap2PixelConfig(bitmap) }
+            SkGr::Bitmap2PixelConfig(bitmap)
         };
         GrContext::ScratchTexMatch match;
         if (kSaveLayerDeviceRenderTarget_TexType == type) {