diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 19:43:45 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-07 19:43:45 +0000 |
| commit | 28621517f42682f1e028cbbf87c6afbf6e27a0f6 (patch) | |
| tree | da4cae914e8afb1cd9ac294c416c842f1989a769 /tests | |
| parent | 7bb36ab259cd856ec8f03d2d377a34899c0ae51f (diff) | |
Fix BGRA readback on Android
R=bsalomon@google.com, robertphillips@google.com
Author: snorp@snorp.net
Review URL: https://chromiumcodereview.appspot.com/22522002
git-svn-id: http://skia.googlecode.com/svn/trunk@10624 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PremulAlphaRoundTripTest.cpp | 7 | ||||
| -rw-r--r-- | tests/ReadPixelsTest.cpp | 9 | ||||
| -rw-r--r-- | tests/WritePixelsTest.cpp | 2 |
3 files changed, 2 insertions, 16 deletions
diff --git a/tests/PremulAlphaRoundTripTest.cpp b/tests/PremulAlphaRoundTripTest.cpp index b25d35834d..28150d6240 100644 --- a/tests/PremulAlphaRoundTripTest.cpp +++ b/tests/PremulAlphaRoundTripTest.cpp @@ -36,14 +36,7 @@ void fillCanvas(SkCanvas* canvas, SkCanvas::Config8888 unpremulConfig) { static const SkCanvas::Config8888 gUnpremulConfigs[] = { SkCanvas::kNative_Unpremul_Config8888, -/** - * There is a bug in Ganesh (http://code.google.com/p/skia/issues/detail?id=438) - * that causes the readback of pixels from BGRA canvas to an RGBA bitmap to - * fail. This should be removed as soon as the issue above is resolved. - */ -#if !defined(SK_BUILD_FOR_ANDROID) SkCanvas::kBGRA_Unpremul_Config8888, -#endif SkCanvas::kRGBA_Unpremul_Config8888, }; diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp index edcb6469c0..24f5954efe 100644 --- a/tests/ReadPixelsTest.cpp +++ b/tests/ReadPixelsTest.cpp @@ -345,15 +345,10 @@ void ReadPixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) { static const SkCanvas::Config8888 gReadConfigs[] = { SkCanvas::kNative_Premul_Config8888, SkCanvas::kNative_Unpremul_Config8888, -/** - * There is a bug in Ganesh (http://code.google.com/p/skia/issues/detail?id=438) - * that causes the readback of pixels from BGRA canvas to an RGBA bitmap to - * fail. This should be removed as soon as the issue above is resolved. - */ -#if !defined(SK_BUILD_FOR_ANDROID) + SkCanvas::kBGRA_Premul_Config8888, SkCanvas::kBGRA_Unpremul_Config8888, -#endif + SkCanvas::kRGBA_Premul_Config8888, SkCanvas::kRGBA_Unpremul_Config8888, }; diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index 508e8e3cf6..202bfd6abf 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -473,7 +473,5 @@ void WritePixelsTest(skiatest::Reporter* reporter, GrContextFactory* factory) { } } -#ifndef SK_BUILD_FOR_ANDROID #include "TestClassDef.h" DEFINE_GPUTESTCLASS("WritePixels", WritePixelsTestClass, WritePixelsTest) -#endif |