d316e77c1e
This reverts commit 398487a850.
Reason for revert: See if this is causing the roll failure
Original change's description:
> Add a deferred copy surface (take 2)
>
> This CL forces all GrSurface copies to go through a GrSurfaceContext (rather than GrContext).
>
> There is a bit of goofiness going on here until read/writePixels is also consolidated in GrSurfaceContext and a proxy-backed SkImage/SkSurface is added.
>
> This is a reland of https://skia-review.googlesource.com/c/5773/ (Add a deferred copy surface)
>
> Change-Id: Ide560f569aede5e622420dc2f30eef76357d69f4
> Reviewed-on: https://skia-review.googlesource.com/5939
> Reviewed-by: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I1ef40f0d5fb0bca62031f94f10eb18acd753e913
Reviewed-on: https://skia-review.googlesource.com/6024
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
72 lines
2.8 KiB
C++
72 lines
2.8 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Test.h"
|
|
#if SK_SUPPORT_GPU
|
|
|
|
#include "GrContext.h"
|
|
#include "GrGpu.h"
|
|
#include "GrTextureStripAtlas.h"
|
|
#include "GrTypes.h"
|
|
#include "SkGpuDevice.h"
|
|
|
|
// This tests that GrTextureStripAtlas flushes pending IO on the texture it acquires.
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrTextureStripAtlasFlush, reporter, ctxInfo) {
|
|
GrContext* context = ctxInfo.grContext();
|
|
GrSurfaceDesc desc;
|
|
desc.fWidth = 32;
|
|
desc.fHeight = 32;
|
|
desc.fConfig = kRGBA_8888_GrPixelConfig;
|
|
GrTexture* texture = context->textureProvider()->createTexture(desc, SkBudgeted::kYes,
|
|
nullptr, 0);
|
|
|
|
GrSurfaceDesc targetDesc = desc;
|
|
targetDesc.fFlags = kRenderTarget_GrSurfaceFlag;
|
|
GrTexture* target = context->textureProvider()->createTexture(targetDesc, SkBudgeted::kYes,
|
|
nullptr, 0);
|
|
|
|
SkAutoTMalloc<uint32_t> pixels(desc.fWidth * desc.fHeight);
|
|
memset(pixels.get(), 0xFF, sizeof(uint32_t) * desc.fWidth * desc.fHeight);
|
|
texture->writePixels(0, 0, desc.fWidth, desc.fHeight, kRGBA_8888_GrPixelConfig, pixels.get());
|
|
|
|
// Add a pending read to the texture, and then make it available for reuse.
|
|
context->copySurface(target, texture);
|
|
texture->unref();
|
|
|
|
// Create an atlas with parameters that allow it to reuse the texture.
|
|
GrTextureStripAtlas::Desc atlasDesc;
|
|
atlasDesc.fContext = context;
|
|
atlasDesc.fConfig = desc.fConfig;
|
|
atlasDesc.fWidth = desc.fWidth;
|
|
atlasDesc.fHeight = desc.fHeight;
|
|
atlasDesc.fRowHeight = 1;
|
|
GrTextureStripAtlas* atlas = GrTextureStripAtlas::GetAtlas(atlasDesc);
|
|
|
|
// Write to the atlas' texture.
|
|
SkImageInfo info = SkImageInfo::MakeN32(desc.fWidth, desc.fHeight, kPremul_SkAlphaType);
|
|
size_t rowBytes = desc.fWidth * GrBytesPerPixel(desc.fConfig);
|
|
SkBitmap bitmap;
|
|
bitmap.allocPixels(info, rowBytes);
|
|
memset(bitmap.getPixels(), 1, rowBytes * desc.fHeight);
|
|
int row = atlas->lockRow(bitmap);
|
|
if (!context->caps()->preferVRAMUseOverFlushes())
|
|
REPORTER_ASSERT(reporter, texture == atlas->getTexture());
|
|
|
|
// The atlas' use of its texture shouldn't change which pixels got copied to the target.
|
|
SkAutoTMalloc<uint32_t> actualPixels(desc.fWidth * desc.fHeight);
|
|
bool success = target->readPixels(0, 0, desc.fWidth, desc.fHeight, kRGBA_8888_GrPixelConfig,
|
|
actualPixels.get());
|
|
REPORTER_ASSERT(reporter, success);
|
|
REPORTER_ASSERT(reporter,
|
|
!memcmp(pixels.get(), actualPixels.get(),
|
|
sizeof(uint32_t) * desc.fWidth * desc.fHeight));
|
|
target->unref();
|
|
atlas->unlockRow(row);
|
|
}
|
|
|
|
#endif
|