Remove many uses of kSkia8888 and kSkiaGamma8888
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3405
Change-Id: Ie920f4bcbb3dd28114a66f2363643bb10009b840
Reviewed-on: https://skia-review.googlesource.com/3405
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/src/gpu/text/GrAtlasTextContext.cpp b/src/gpu/text/GrAtlasTextContext.cpp
index 285aea4..83c34df 100644
--- a/src/gpu/text/GrAtlasTextContext.cpp
+++ b/src/gpu/text/GrAtlasTextContext.cpp
@@ -390,7 +390,7 @@
// Setup dummy SkPaint / GrPaint / GrDrawContext
sk_sp<GrDrawContext> drawContext(context->makeDrawContext(SkBackingFit::kApprox, 1024, 1024,
- kSkia8888_GrPixelConfig, nullptr));
+ kRGBA_8888_GrPixelConfig, nullptr));
GrColor color = GrRandomColor(random);
SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
diff --git a/src/views/SkWindow.cpp b/src/views/SkWindow.cpp
index 6e1ebf7..d82187a 100644
--- a/src/views/SkWindow.cpp
+++ b/src/views/SkWindow.cpp
@@ -344,7 +344,7 @@
grContext->caps()->srgbSupport() &&
SkImageInfoIsGammaCorrect(info()) &&
(attachmentInfo.fColorBits != 30)
- ? kSkiaGamma8888_GrPixelConfig : kSkia8888_GrPixelConfig;
+ ? kSRGBA_8888_GrPixelConfig : kRGBA_8888_GrPixelConfig;
desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
desc.fSampleCnt = attachmentInfo.fSampleCount;
desc.fStencilBits = attachmentInfo.fStencilBits;
diff --git a/tests/DFPathRendererTest.cpp b/tests/DFPathRendererTest.cpp
index d36c168..30ca17d 100644
--- a/tests/DFPathRendererTest.cpp
+++ b/tests/DFPathRendererTest.cpp
@@ -65,7 +65,7 @@
}
sk_sp<GrDrawContext> dc(ctxInfo.grContext()->makeDrawContext(SkBackingFit::kApprox,
800, 800,
- kSkia8888_GrPixelConfig,
+ kRGBA_8888_GrPixelConfig,
nullptr,
0,
kTopLeft_GrSurfaceOrigin));
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 96b0bcb..9e501cb 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -294,7 +294,7 @@
// setup dummy textures
GrSurfaceDesc dummyDesc;
dummyDesc.fFlags = kRenderTarget_GrSurfaceFlag;
- dummyDesc.fConfig = kSkia8888_GrPixelConfig;
+ dummyDesc.fConfig = kRGBA_8888_GrPixelConfig;
dummyDesc.fWidth = 34;
dummyDesc.fHeight = 18;
SkAutoTUnref<GrTexture> dummyTexture1(
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index e61b934..b6ca406 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -21,7 +21,7 @@
DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrSurface, reporter, ctxInfo) {
GrContext* context = ctxInfo.grContext();
GrSurfaceDesc desc;
- desc.fConfig = kSkia8888_GrPixelConfig;
+ desc.fConfig = kRGBA_8888_GrPixelConfig;
desc.fFlags = kRenderTarget_GrSurfaceFlag;
desc.fWidth = 256;
desc.fHeight = 256;
@@ -45,10 +45,10 @@
REPORTER_ASSERT(reporter, static_cast<GrSurface*>(tex1) == tex1->asTexture());
GrBackendObject backendTex = context->getGpu()->createTestingOnlyBackendTexture(
- nullptr, 256, 256, kSkia8888_GrPixelConfig);
+ nullptr, 256, 256, kRGBA_8888_GrPixelConfig);
GrBackendTextureDesc backendDesc;
- backendDesc.fConfig = kSkia8888_GrPixelConfig;
+ backendDesc.fConfig = kRGBA_8888_GrPixelConfig;
backendDesc.fFlags = kRenderTarget_GrBackendTextureFlag;
backendDesc.fWidth = 256;
backendDesc.fHeight = 256;
diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp
index 92858c1..18d3144 100644
--- a/tests/ImageFilterCacheTest.cpp
+++ b/tests/ImageFilterCacheTest.cpp
@@ -197,7 +197,7 @@
}
GrBackendTextureDesc backendDesc;
- backendDesc.fConfig = kSkia8888_GrPixelConfig;
+ backendDesc.fConfig = kRGBA_8888_GrPixelConfig;
backendDesc.fFlags = kNone_GrBackendTextureFlag;
backendDesc.fWidth = kFullSize;
backendDesc.fHeight = kFullSize;
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 668ae5a..7f0c69c 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -367,7 +367,7 @@
if (context) {
return SkSpecialSurface::MakeRenderTarget(context,
widthHeight, widthHeight,
- kSkia8888_GrPixelConfig, nullptr);
+ kRGBA_8888_GrPixelConfig, nullptr);
} else
#endif
{
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 3176366..d73ad64 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -33,7 +33,7 @@
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ResourceCacheCache, reporter, ctxInfo) {
GrContext* context = ctxInfo.grContext();
GrSurfaceDesc desc;
- desc.fConfig = kSkia8888_GrPixelConfig;
+ desc.fConfig = kRGBA_8888_GrPixelConfig;
desc.fFlags = kRenderTarget_GrSurfaceFlag;
desc.fWidth = gWidth;
desc.fHeight = gHeight;
@@ -84,7 +84,7 @@
GrContext* context = ctxInfo.grContext();
GrSurfaceDesc smallDesc;
smallDesc.fFlags = kRenderTarget_GrSurfaceFlag;
- smallDesc.fConfig = kSkia8888_GrPixelConfig;
+ smallDesc.fConfig = kRGBA_8888_GrPixelConfig;
smallDesc.fWidth = 4;
smallDesc.fHeight = 4;
smallDesc.fSampleCnt = 0;
@@ -122,7 +122,7 @@
// An RT with a much larger size should not share.
GrSurfaceDesc bigDesc;
bigDesc.fFlags = kRenderTarget_GrSurfaceFlag;
- bigDesc.fConfig = kSkia8888_GrPixelConfig;
+ bigDesc.fConfig = kRGBA_8888_GrPixelConfig;
bigDesc.fWidth = 400;
bigDesc.fHeight = 200;
bigDesc.fSampleCnt = 0;
diff --git a/tests/SRGBMipMapTest.cpp b/tests/SRGBMipMapTest.cpp
index 6eb4b21..9acf829 100644
--- a/tests/SRGBMipMapTest.cpp
+++ b/tests/SRGBMipMapTest.cpp
@@ -112,7 +112,7 @@
// Create our test texture
GrSurfaceDesc desc;
desc.fFlags = kNone_GrSurfaceFlags;
- desc.fConfig = kSkiaGamma8888_GrPixelConfig;
+ desc.fConfig = kSRGBA_8888_GrPixelConfig;
desc.fWidth = texS;
desc.fHeight = texS;
@@ -122,10 +122,10 @@
// Create two draw contexts (L32 and S32)
sk_sp<SkColorSpace> srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
sk_sp<GrDrawContext> l32DrawContext = context->makeDrawContext(SkBackingFit::kExact, rtS, rtS,
- kSkia8888_GrPixelConfig,
+ kRGBA_8888_GrPixelConfig,
nullptr);
sk_sp<GrDrawContext> s32DrawContext = context->makeDrawContext(SkBackingFit::kExact, rtS, rtS,
- kSkiaGamma8888_GrPixelConfig,
+ kSRGBA_8888_GrPixelConfig,
std::move(srgbColorSpace));
SkRect rect = SkRect::MakeWH(SkIntToScalar(rtS), SkIntToScalar(rtS));
diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp
index 7d84c3a..d850daa 100644
--- a/tests/SkpSkGrTest.cpp
+++ b/tests/SkpSkGrTest.cpp
@@ -439,7 +439,7 @@
SkCanvas skCanvas(bitmap);
drawPict(pic, &skCanvas, fScaleOversized ? scale : 1);
GrTextureDesc desc;
- desc.fConfig = kSkia8888_GrPixelConfig;
+ desc.fConfig = kRGBA_8888_GrPixelConfig;
desc.fFlags = kRenderTarget_GrTextureFlagBit;
desc.fWidth = dim.fX;
desc.fHeight = dim.fY;
diff --git a/tests/SpecialSurfaceTest.cpp b/tests/SpecialSurfaceTest.cpp
index a0ec317..1867e25 100644
--- a/tests/SpecialSurfaceTest.cpp
+++ b/tests/SpecialSurfaceTest.cpp
@@ -81,7 +81,7 @@
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialSurface_Gpu1, reporter, ctxInfo) {
sk_sp<SkSpecialSurface> surf(SkSpecialSurface::MakeRenderTarget(ctxInfo.grContext(),
kSmallerSize, kSmallerSize,
- kSkia8888_GrPixelConfig,
+ kRGBA_8888_GrPixelConfig,
nullptr));
test_surface(surf, reporter, 0);
diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp
index 232ea36..5160124 100644
--- a/tests/TessellatingPathRendererTests.cpp
+++ b/tests/TessellatingPathRendererTests.cpp
@@ -273,7 +273,7 @@
DEF_GPUTEST_FOR_ALL_CONTEXTS(TessellatingPathRendererTests, reporter, ctxInfo) {
sk_sp<GrDrawContext> dc(ctxInfo.grContext()->makeDrawContext(SkBackingFit::kApprox,
800, 800,
- kSkia8888_GrPixelConfig,
+ kRGBA_8888_GrPixelConfig,
nullptr,
0,
kTopLeft_GrSurfaceOrigin));
diff --git a/tools/viewer/sk_app/GLWindowContext.cpp b/tools/viewer/sk_app/GLWindowContext.cpp
index 3c3164a..fff5e96 100644
--- a/tools/viewer/sk_app/GLWindowContext.cpp
+++ b/tools/viewer/sk_app/GLWindowContext.cpp
@@ -45,7 +45,7 @@
fPixelConfig = fContext->caps()->srgbSupport() &&
SkColorAndColorSpaceAreGammaCorrect(fDisplayParams.fColorType,
fDisplayParams.fColorSpace.get()) &&
- (fColorBits != 30) ? kSkiaGamma8888_GrPixelConfig : kSkia8888_GrPixelConfig;
+ (fColorBits != 30) ? kSRGBA_8888_GrPixelConfig : kRGBA_8888_GrPixelConfig;
}
void GLWindowContext::destroyContext() {