Index: tests/ImageTest.cpp |
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp |
index efded7c6defa347edefb8c86b00947339f75ba67..2dccff2d5eb243e7aab15cf52c28deed325a6884 100644 |
--- a/tests/ImageTest.cpp |
+++ b/tests/ImageTest.cpp |
@@ -745,27 +745,18 @@ struct TextureReleaseChecker { |
static_cast<TextureReleaseChecker*>(self)->fReleaseCount++; |
} |
}; |
-static void check_image_color(skiatest::Reporter* reporter, SkImage* image, SkPMColor expected) { |
- const SkImageInfo info = SkImageInfo::MakeN32Premul(1, 1); |
- SkPMColor pixel; |
- REPORTER_ASSERT(reporter, image->readPixels(info, &pixel, sizeof(pixel), 0, 0)); |
- REPORTER_ASSERT(reporter, pixel == expected); |
-} |
-DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTexture, reporter, ctxInfo) { |
+DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTextureRelease, reporter, ctxInfo) { |
GrTextureProvider* provider = ctxInfo.grContext()->textureProvider(); |
const int w = 10; |
const int h = 10; |
- SkPMColor storage[w * h]; |
- const SkPMColor expected0 = SkPreMultiplyColor(SK_ColorRED); |
- sk_memset32(storage, expected0, w * h); |
GrSurfaceDesc desc; |
- desc.fFlags = kRenderTarget_GrSurfaceFlag; // needs to be a rendertarget for readpixels(); |
+ desc.fFlags = kRenderTarget_GrSurfaceFlag; |
desc.fOrigin = kDefault_GrSurfaceOrigin; |
desc.fWidth = w; |
desc.fHeight = h; |
desc.fConfig = kSkia8888_GrPixelConfig; |
desc.fSampleCnt = 0; |
- SkAutoTUnref<GrTexture> tex(provider->createTexture(desc, SkBudgeted::kNo, storage, w * 4)); |
+ SkAutoTUnref<GrTexture> tex(provider->createTexture(desc, SkBudgeted::kNo)); |
if (!tex) { |
REPORTER_ASSERT(reporter, false); |
return; |
@@ -783,20 +774,6 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTexture, reporter, ctxInfo) |
SkImage::MakeFromTexture(ctxInfo.grContext(), backendDesc, kPremul_SkAlphaType, |
TextureReleaseChecker::Release, &releaseChecker)); |
- check_image_color(reporter, refImg.get(), expected0); |
- |
- // Now lets jam new colors into our "external" texture, and see if the images notice |
- const SkPMColor expected1 = SkPreMultiplyColor(SK_ColorBLUE); |
- sk_memset32(storage, expected1, w * h); |
- tex->writePixels(0, 0, w, h, kSkia8888_GrPixelConfig, storage, GrContext::kFlushWrites_PixelOp); |
- |
- // The cpy'd one should still see the old color |
-#if 0 |
- // There is no guarantee that refImg sees the new color. We are free to have made a copy. Our |
- // write pixels call violated the contract with refImg and refImg is now undefined. |
- check_image_color(reporter, refImg, expected1); |
-#endif |
- |
// Now exercise the release proc |
REPORTER_ASSERT(reporter, 0 == releaseChecker.fReleaseCount); |
refImg.reset(nullptr); // force a release of the image |