Remove GrAALevel enum, use explicit sample count
Review URL: http://codereview.appspot.com/5600045/
git-svn-id: http://skia.googlecode.com/svn/trunk@3106 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 5a34ef2..d34ef6a 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -216,10 +216,10 @@
#else
const GrTextureDesc desc = {
kRenderTarget_GrTextureFlagBit,
- kNone_GrAALevel,
width,
height,
- SkGr::Bitmap2PixelConfig(bm)
+ SkGr::Bitmap2PixelConfig(bm),
+ {0} // samples
};
fTexture = fContext->createUncachedTexture(desc, NULL, 0);
@@ -765,10 +765,10 @@
const GrTextureDesc desc = {
kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit,
- kNone_GrAALevel,
srcRect.width(),
srcRect.height(),
- kRGBA_8888_GrPixelConfig
+ kRGBA_8888_GrPixelConfig,
+ {0} // samples
};
temp1->set(context, desc);
@@ -900,12 +900,12 @@
srcRect.offset(offset);
const GrTextureDesc desc = {
kRenderTarget_GrTextureFlagBit,
- kNone_GrAALevel,
srcRect.width(),
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,
+ {0} // samples
};
GrAutoScratchTexture pathEntry(context, desc);
@@ -1032,10 +1032,10 @@
const GrTextureDesc desc = {
kNone_GrTextureFlags,
- kNone_GrAALevel,
dstM.fBounds.width(),
dstM.fBounds.height(),
- kAlpha_8_GrPixelConfig
+ kAlpha_8_GrPixelConfig,
+ {0}, // samples
};
GrAutoScratchTexture ast(context, desc);
@@ -1783,10 +1783,10 @@
if (kBitmap_TexType != type) {
const GrTextureDesc desc = {
kRenderTarget_GrTextureFlagBit,
- kNone_GrAALevel,
bitmap.width(),
bitmap.height(),
- SkGr::Bitmap2PixelConfig(bitmap)
+ SkGr::Bitmap2PixelConfig(bitmap),
+ {0} // samples
};
GrContext::ScratchTexMatch match;
if (kSaveLayerDeviceRenderTarget_TexType == type) {