Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: tests/ImageTest.cpp

Issue 1778143003: Fix readback of 565 on Mac and enable tests (Closed) Base URL: https://skia.googlesource.com/skia.git@newtexfrompixmap
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGLGpu.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/ImageTest.cpp
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index f646a386d995d392d4e60d28eae60162f2a7ad1b..aaf601d042f49eb8c2bd4d03fad0bfe019543e56 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -65,14 +65,12 @@ static SkImage* create_image() {
draw_image_test_pattern(surface->getCanvas());
return surface->newImageSnapshot();
}
-#if 0
static SkImage* create_image_565() {
const SkImageInfo info = SkImageInfo::Make(20, 20, kRGB_565_SkColorType, kOpaque_SkAlphaType);
SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
draw_image_test_pattern(surface->getCanvas());
return surface->newImageSnapshot();
}
-#endif
static SkImage* create_image_ct() {
SkPMColor colors[] = {
SkPreMultiplyARGB(0xFF, 0xFF, 0xFF, 0x00),
@@ -800,12 +798,9 @@ static void check_images_same(skiatest::Reporter* reporter, const SkImage* a, co
}
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(NewTextureFromPixmap, reporter, context) {
- for (auto create : {&create_image
-#if 0 // read pixels failing for non RT formats (565 not a RT on some desktop GLs).
- , &create_image_565
-#endif
- , &create_image_ct
- }) {
+ for (auto create : {&create_image,
+ &create_image_565,
+ &create_image_ct}) {
SkAutoTUnref<SkImage> image((*create)());
if (!image) {
ERRORF(reporter, "Could not create image");
« no previous file with comments | « src/gpu/gl/GrGLGpu.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698