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

Side by Side Diff: tests/ImageTest.cpp

Issue 1784553003: Fix Mac bots because of failing readback of 565 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: comment out unused function 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include <functional> 8 #include <functional>
9 #include <initializer_list> 9 #include <initializer_list>
10 #include "DMGpuSupport.h" 10 #include "DMGpuSupport.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 SkPaint paint; 61 SkPaint paint;
62 paint.setColor(SK_ColorBLACK); 62 paint.setColor(SK_ColorBLACK);
63 canvas->drawRect(SkRect::MakeXYWH(5, 5, 10, 10), paint); 63 canvas->drawRect(SkRect::MakeXYWH(5, 5, 10, 10), paint);
64 } 64 }
65 static SkImage* create_image() { 65 static SkImage* create_image() {
66 const SkImageInfo info = SkImageInfo::MakeN32(20, 20, kOpaque_SkAlphaType); 66 const SkImageInfo info = SkImageInfo::MakeN32(20, 20, kOpaque_SkAlphaType);
67 SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info)); 67 SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
68 draw_image_test_pattern(surface->getCanvas()); 68 draw_image_test_pattern(surface->getCanvas());
69 return surface->newImageSnapshot(); 69 return surface->newImageSnapshot();
70 } 70 }
71 #if 0
71 static SkImage* create_image_565() { 72 static SkImage* create_image_565() {
72 const SkImageInfo info = SkImageInfo::Make(20, 20, kRGB_565_SkColorType, kOp aque_SkAlphaType); 73 const SkImageInfo info = SkImageInfo::Make(20, 20, kRGB_565_SkColorType, kOp aque_SkAlphaType);
73 SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info)); 74 SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
74 draw_image_test_pattern(surface->getCanvas()); 75 draw_image_test_pattern(surface->getCanvas());
75 return surface->newImageSnapshot(); 76 return surface->newImageSnapshot();
76 } 77 }
78 #endif
77 #if 0 79 #if 0
78 static SkImage* create_image_ct() { 80 static SkImage* create_image_ct() {
79 SkPMColor colors[] = { 81 SkPMColor colors[] = {
80 SkPreMultiplyARGB(0xFF, 0xFF, 0xFF, 0x00), 82 SkPreMultiplyARGB(0xFF, 0xFF, 0xFF, 0x00),
81 SkPreMultiplyARGB(0x80, 0x00, 0xA0, 0xFF), 83 SkPreMultiplyARGB(0x80, 0x00, 0xA0, 0xFF),
82 SkPreMultiplyARGB(0xFF, 0xBB, 0x00, 0xBB) 84 SkPreMultiplyARGB(0xFF, 0xBB, 0x00, 0xBB)
83 }; 85 };
84 SkAutoTUnref<SkColorTable> colorTable(new SkColorTable(colors, SK_ARRAY_COUN T(colors))); 86 SkAutoTUnref<SkColorTable> colorTable(new SkColorTable(colors, SK_ARRAY_COUN T(colors)));
85 uint8_t data[] = { 87 uint8_t data[] = {
86 0, 0, 0, 0, 0, 88 0, 0, 0, 0, 0,
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 ERRORF(reporter, "Expected image pixels to be the same. At %d,%d 0x%08x != 0x%08x", 800 ERRORF(reporter, "Expected image pixels to be the same. At %d,%d 0x%08x != 0x%08x",
799 x, y, pixelA, pixelB); 801 x, y, pixelA, pixelB);
800 return; 802 return;
801 } 803 }
802 } 804 }
803 } 805 }
804 } 806 }
805 807
806 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(NewTextureFromPixmap, reporter, context) { 808 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(NewTextureFromPixmap, reporter, context) {
807 for (auto create : {&create_image, 809 for (auto create : {&create_image,
810 #if 0 // read pixels failing for non RT formats (565 not a RT on some desktop GL s).
808 &create_image_565 811 &create_image_565
809 #if 0 // peekPixels on color table images is currently broken. 812 #if 0 // peekPixels on color table images is currently broken.
810 , &create_image_ct 813 , &create_image_ct
811 #endif 814 #endif
815 #endif
812 }) { 816 }) {
813 SkAutoTUnref<SkImage> image((*create)()); 817 SkAutoTUnref<SkImage> image((*create)());
814 if (!image) { 818 if (!image) {
815 ERRORF(reporter, "Could not create image"); 819 ERRORF(reporter, "Could not create image");
816 return; 820 return;
817 } 821 }
818 822
819 SkPixmap pixmap; 823 SkPixmap pixmap;
820 if (!image->peekPixels(&pixmap)) { 824 if (!image->peekPixels(&pixmap)) {
821 ERRORF(reporter, "peek failed"); 825 ERRORF(reporter, "peek failed");
822 } else { 826 } else {
823 SkAutoTUnref<SkImage> texImage(SkImage::NewTextureFromPixmap(context , pixmap, 827 SkAutoTUnref<SkImage> texImage(SkImage::NewTextureFromPixmap(context , pixmap,
824 SkBudge ted::kNo)); 828 SkBudge ted::kNo));
825 if (!texImage) { 829 if (!texImage) {
826 ERRORF(reporter, "NewTextureFromPixmap failed."); 830 ERRORF(reporter, "NewTextureFromPixmap failed.");
827 } else { 831 } else {
828 check_images_same(reporter, image, texImage); 832 check_images_same(reporter, image, texImage);
829 } 833 }
830 } 834 }
831 } 835 }
832 } 836 }
833 837
834 #endif 838 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698