Rm readPixels from GrSurface & move read/writeSurfacePixels to GrContextPriv (take 2)
This is in service of: https://skia-review.googlesource.com/c/11125/ (Add parallel proxyID to StencilOps & RenderTargetOpList) where I want a better choke point for texture creation to improve discard handling.
This is a reland of: https://skia-review.googlesource.com/c/11200/ (Rm readPixels from GrSurface & move read/writeSurfacePixels to GrContextPriv)
Change-Id: Icd0a90d2beb483dc24ed87c3bace9c817019e148
Reviewed-on: https://skia-review.googlesource.com/11326
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index ccd2728..0987d96 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -246,68 +246,6 @@
*/
void flush();
- /**
- * These flags can be used with the read/write pixels functions below.
- */
- enum PixelOpsFlags {
- /** The GrContext will not be flushed before the surface read or write. This means that
- the read or write may occur before previous draws have executed. */
- kDontFlush_PixelOpsFlag = 0x1,
- /** Any surface writes should be flushed to the backend 3D API after the surface operation
- is complete */
- kFlushWrites_PixelOp = 0x2,
- /** The src for write or dst read is unpremultiplied. This is only respected if both the
- config src and dst configs are an RGBA/BGRA 8888 format. */
- kUnpremul_PixelOpsFlag = 0x4,
- };
-
- /**
- * Reads a rectangle of pixels from a surface.
- * @param surface the surface to read from.
- * @param srcColorSpace color space of the surface
- * @param left left edge of the rectangle to read (inclusive)
- * @param top top edge of the rectangle to read (inclusive)
- * @param width width of rectangle to read in pixels.
- * @param height height of rectangle to read in pixels.
- * @param config the pixel config of the destination buffer
- * @param dstColorSpace color space of the destination buffer
- * @param buffer memory to read the rectangle into.
- * @param rowBytes number of bytes bewtween consecutive rows. Zero means rows are tightly
- * packed.
- * @param pixelOpsFlags see PixelOpsFlags enum above.
- *
- * @return true if the read succeeded, false if not. The read can fail because of an unsupported
- * pixel configs
- */
- bool readSurfacePixels(GrSurface* surface, SkColorSpace* srcColorSpace,
- int left, int top, int width, int height,
- GrPixelConfig config, SkColorSpace* dstColorSpace, void* buffer,
- size_t rowBytes = 0,
- uint32_t pixelOpsFlags = 0);
-
- /**
- * Writes a rectangle of pixels to a surface.
- * @param surface the surface to write to.
- * @param dstColorSpace color space of the surface
- * @param left left edge of the rectangle to write (inclusive)
- * @param top top edge of the rectangle to write (inclusive)
- * @param width width of rectangle to write in pixels.
- * @param height height of rectangle to write in pixels.
- * @param config the pixel config of the source buffer
- * @param srcColorSpace color space of the source buffer
- * @param buffer memory to read pixels from
- * @param rowBytes number of bytes between consecutive rows. Zero
- * means rows are tightly packed.
- * @param pixelOpsFlags see PixelOpsFlags enum above.
- * @return true if the write succeeded, false if not. The write can fail because of an
- * unsupported combination of surface and src configs.
- */
- bool writeSurfacePixels(GrSurface* surface, SkColorSpace* dstColorSpace,
- int left, int top, int width, int height,
- GrPixelConfig config, SkColorSpace* srcColorSpace, const void* buffer,
- size_t rowBytes,
- uint32_t pixelOpsFlags = 0);
-
/**
* An ID associated with this context, guaranteed to be unique.
*/
diff --git a/include/gpu/GrProcessorUnitTest.h b/include/gpu/GrProcessorUnitTest.h
index 912e393..d6269c8 100644
--- a/include/gpu/GrProcessorUnitTest.h
+++ b/include/gpu/GrProcessorUnitTest.h
@@ -49,12 +49,12 @@
GrProcessorTestData(SkRandom* random,
GrContext* context,
const GrRenderTargetContext* renderTargetContext,
- GrTexture* const textures[2])
+ sk_sp<GrTextureProxy> proxies[2])
: fRandom(random)
, fRenderTargetContext(renderTargetContext)
, fContext(context) {
- fProxies[0] = GrSurfaceProxy::MakeWrapped(sk_ref_sp(textures[0]));
- fProxies[1] = GrSurfaceProxy::MakeWrapped(sk_ref_sp(textures[1]));
+ fProxies[0] = proxies[0];
+ fProxies[1] = proxies[1];
}
SkRandom* fRandom;
const GrRenderTargetContext* fRenderTargetContext;
diff --git a/include/gpu/GrSurface.h b/include/gpu/GrSurface.h
index 328731c..81bc215 100644
--- a/include/gpu/GrSurface.h
+++ b/include/gpu/GrSurface.h
@@ -66,106 +66,6 @@
virtual GrRenderTarget* asRenderTarget() { return NULL; }
virtual const GrRenderTarget* asRenderTarget() const { return NULL; }
- /**
- * Reads a rectangle of pixels from the surface, possibly performing color space conversion.
- * @param srcColorSpace color space of the source data (this surface)
- * @param left left edge of the rectangle to read (inclusive)
- * @param top top edge of the rectangle to read (inclusive)
- * @param width width of rectangle to read in pixels.
- * @param height height of rectangle to read in pixels.
- * @param config the pixel config of the destination buffer
- * @param dstColorSpace color space of the destination buffer
- * @param buffer memory to read the rectangle into.
- * @param rowBytes number of bytes between consecutive rows. Zero means rows are tightly
- * packed.
- * @param pixelOpsFlags See the GrContext::PixelOpsFlags enum.
- *
- * @return true if the read succeeded, false if not. The read can fail because of an unsupported
- * pixel config.
- */
- bool readPixels(SkColorSpace* srcColorSpace,
- int left, int top, int width, int height,
- GrPixelConfig config,
- SkColorSpace* dstColorSpace,
- void* buffer,
- size_t rowBytes = 0,
- uint32_t pixelOpsFlags = 0);
-
- /**
- * Reads a rectangle of pixels from the surface. Does not perform any color space conversion.
- * @param left left edge of the rectangle to read (inclusive)
- * @param top top edge of the rectangle to read (inclusive)
- * @param width width of rectangle to read in pixels.
- * @param height height of rectangle to read in pixels.
- * @param config the pixel config of the destination buffer
- * @param buffer memory to read the rectangle into.
- * @param rowBytes number of bytes between consecutive rows. Zero means rows are tightly
- * packed.
- * @param pixelOpsFlags See the GrContext::PixelOpsFlags enum.
- *
- * @return true if the read succeeded, false if not. The read can fail because of an unsupported
- * pixel config.
- */
- bool readPixels(int left, int top, int width, int height,
- GrPixelConfig config,
- void* buffer,
- size_t rowBytes = 0,
- uint32_t pixelOpsFlags = 0) {
- return this->readPixels(nullptr, left, top, width, height, config, nullptr, buffer,
- rowBytes, pixelOpsFlags);
- }
-
- /**
- * Copy the src pixels [buffer, rowbytes, pixelconfig] into the surface at the specified
- * rectangle, possibly performing color space conversion.
- * @param dstColorSpace color space of the destination (this surface)
- * @param left left edge of the rectangle to write (inclusive)
- * @param top top edge of the rectangle to write (inclusive)
- * @param width width of rectangle to write in pixels.
- * @param height height of rectangle to write in pixels.
- * @param config the pixel config of the source buffer
- * @param srcColorSpace color space of the source buffer
- * @param buffer memory to read the rectangle from.
- * @param rowBytes number of bytes between consecutive rows. Zero means rows are tightly
- * packed.
- * @param pixelOpsFlags See the GrContext::PixelOpsFlags enum.
- *
- * @return true if the write succeeded, false if not. The write can fail because of an
- * unsupported pixel config.
- */
- bool writePixels(SkColorSpace* dstColorSpace,
- int left, int top, int width, int height,
- GrPixelConfig config,
- SkColorSpace* srcColorSpace,
- const void* buffer,
- size_t rowBytes = 0,
- uint32_t pixelOpsFlags = 0);
-
- /**
- * Copy the src pixels [buffer, rowbytes, pixelconfig] into the surface at the specified
- * rectangle. Does not perform any color space conversion.
- * @param left left edge of the rectangle to write (inclusive)
- * @param top top edge of the rectangle to write (inclusive)
- * @param width width of rectangle to write in pixels.
- * @param height height of rectangle to write in pixels.
- * @param config the pixel config of the source buffer
- * @param buffer memory to read the rectangle from.
- * @param rowBytes number of bytes between consecutive rows. Zero means rows are tightly
- * packed.
- * @param pixelOpsFlags See the GrContext::PixelOpsFlags enum.
- *
- * @return true if the write succeeded, false if not. The write can fail because of an
- * unsupported pixel config.
- */
- bool writePixels(int left, int top, int width, int height,
- GrPixelConfig config,
- const void* buffer,
- size_t rowBytes = 0,
- uint32_t pixelOpsFlags = 0) {
- return this->writePixels(nullptr, left, top, width, height, config, nullptr, buffer,
- rowBytes, pixelOpsFlags);
- }
-
/** Access methods that are only to be used within Skia code. */
inline GrSurfacePriv surfacePriv();
inline const GrSurfacePriv surfacePriv() const;
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 98f709a..c1961f9 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -26,6 +26,8 @@
#include "effects/GrConfigConversionEffect.h"
#include "text/GrTextBlobCache.h"
+#define ASSERT_OWNED_PROXY(P) \
+SkASSERT(!(P) || !((P)->priv().peekTexture()) || (P)->priv().peekTexture()->getContext() == this)
#define ASSERT_OWNED_PROXY_PRIV(P) \
SkASSERT(!(P) || !((P)->priv().peekTexture()) || (P)->priv().peekTexture()->getContext() == fContext)
@@ -37,6 +39,7 @@
#define RETURN_IF_ABANDONED if (fDrawingManager->wasAbandoned()) { return; }
#define RETURN_IF_ABANDONED_PRIV if (fContext->fDrawingManager->wasAbandoned()) { return; }
#define RETURN_FALSE_IF_ABANDONED if (fDrawingManager->wasAbandoned()) { return false; }
+#define RETURN_FALSE_IF_ABANDONED_PRIV if (fContext->fDrawingManager->wasAbandoned()) { return false; }
#define RETURN_NULL_IF_ABANDONED if (fDrawingManager->wasAbandoned()) { return nullptr; }
////////////////////////////////////////////////////////////////////////////////
@@ -264,19 +267,25 @@
return GrPixelConfigIs8888Unorm(config) || kRGBA_half_GrPixelConfig == config;
}
-bool GrContext::writeSurfacePixels(GrSurface* surface, SkColorSpace* dstColorSpace,
- int left, int top, int width, int height,
- GrPixelConfig srcConfig, SkColorSpace* srcColorSpace,
- const void* buffer, size_t rowBytes, uint32_t pixelOpsFlags) {
+bool GrContextPriv::writeSurfacePixels(GrSurfaceProxy* srcProxy, SkColorSpace* dstColorSpace,
+ int left, int top, int width, int height,
+ GrPixelConfig srcConfig, SkColorSpace* srcColorSpace,
+ const void* buffer, size_t rowBytes,
+ uint32_t pixelOpsFlags) {
// TODO: Color space conversion
- ASSERT_SINGLE_OWNER
- RETURN_FALSE_IF_ABANDONED
- ASSERT_OWNED_RESOURCE(surface);
- SkASSERT(surface);
- GR_AUDIT_TRAIL_AUTO_FRAME(&fAuditTrail, "GrContext::writeSurfacePixels");
+ ASSERT_SINGLE_OWNER_PRIV
+ RETURN_FALSE_IF_ABANDONED_PRIV
+ ASSERT_OWNED_PROXY_PRIV(srcProxy);
+ SkASSERT(srcProxy);
+ GR_AUDIT_TRAIL_AUTO_FRAME(&fContext->fAuditTrail, "GrContextPriv::writeSurfacePixels");
- this->testPMConversionsIfNecessary(pixelOpsFlags);
+ GrSurface* surface = srcProxy->instantiate(fContext->resourceProvider());
+ if (!surface) {
+ return false;
+ }
+
+ fContext->testPMConversionsIfNecessary(pixelOpsFlags);
// Trim the params here so that if we wind up making a temporary surface it can be as small as
// necessary and because GrGpu::getWritePixelsInfo requires it.
@@ -298,23 +307,23 @@
GrGpu::DrawPreference drawPreference = GrGpu::kNoDraw_DrawPreference;
// Don't prefer to draw for the conversion (and thereby access a texture from the cache) when
// we've already determined that there isn't a roundtrip preserving conversion processor pair.
- if (applyPremulToSrc && this->validPMUPMConversionExists(srcConfig)) {
+ if (applyPremulToSrc && fContext->validPMUPMConversionExists(srcConfig)) {
drawPreference = GrGpu::kCallerPrefersDraw_DrawPreference;
}
GrGpu::WritePixelTempDrawInfo tempDrawInfo;
- if (!fGpu->getWritePixelsInfo(surface, width, height, srcConfig, &drawPreference,
- &tempDrawInfo)) {
+ if (!fContext->fGpu->getWritePixelsInfo(surface, width, height, srcConfig,
+ &drawPreference, &tempDrawInfo)) {
return false;
}
if (!(kDontFlush_PixelOpsFlag & pixelOpsFlags) && surface->surfacePriv().hasPendingIO()) {
- this->contextPriv().flush(nullptr); // MDB TODO: tighten this
+ this->flush(nullptr); // MDB TODO: tighten this
}
sk_sp<GrTextureProxy> tempProxy;
if (GrGpu::kNoDraw_DrawPreference != drawPreference) {
- tempProxy = GrSurfaceProxy::MakeDeferred(this->resourceProvider(),
+ tempProxy = GrSurfaceProxy::MakeDeferred(fContext->resourceProvider(),
tempDrawInfo.fTempSurfaceDesc,
SkBackingFit::kApprox,
SkBudgeted::kYes);
@@ -328,7 +337,7 @@
if (tempProxy) {
sk_sp<GrFragmentProcessor> fp;
if (applyPremulToSrc) {
- fp = this->createUPMToPMEffect(tempProxy, SkMatrix::I());
+ fp = fContext->createUPMToPMEffect(tempProxy, SkMatrix::I());
fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), tempDrawInfo.fSwizzle);
// If premultiplying was the only reason for the draw, fall back to a straight write.
if (!fp) {
@@ -341,7 +350,7 @@
}
if (tempProxy) {
if (!fp) {
- fp = GrSimpleTextureEffect::Make(this->resourceProvider(), tempProxy, nullptr,
+ fp = GrSimpleTextureEffect::Make(fContext->resourceProvider(), tempProxy, nullptr,
SkMatrix::I());
fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), tempDrawInfo.fSwizzle);
@@ -350,9 +359,9 @@
}
}
if (tempProxy->priv().hasPendingIO()) {
- this->contextPriv().flush(tempProxy.get());
+ this->flush(tempProxy.get());
}
- GrTexture* texture = tempProxy->instantiate(this->resourceProvider());
+ GrTexture* texture = tempProxy->instantiate(fContext->resourceProvider());
if (!texture) {
return false;
}
@@ -367,9 +376,9 @@
buffer = tmpPixels.get();
applyPremulToSrc = false;
}
- if (!fGpu->writePixels(texture, 0, 0, width, height,
- tempDrawInfo.fWriteConfig, buffer,
- rowBytes)) {
+ if (!fContext->fGpu->writePixels(texture, 0, 0, width, height,
+ tempDrawInfo.fWriteConfig, buffer,
+ rowBytes)) {
return false;
}
SkMatrix matrix;
@@ -380,8 +389,7 @@
GrRenderTarget* renderTarget = surface->asRenderTarget();
SkASSERT(renderTarget);
sk_sp<GrRenderTargetContext> renderTargetContext(
- this->contextPriv().makeWrappedRenderTargetContext(sk_ref_sp(renderTarget),
- nullptr));
+ this->makeWrappedRenderTargetContext(sk_ref_sp(renderTarget), nullptr));
if (!renderTargetContext) {
return false;
}
@@ -394,7 +402,7 @@
nullptr);
if (kFlushWrites_PixelOp & pixelOpsFlags) {
- this->contextPriv().flushSurfaceWrites(renderTargetContext->asRenderTargetProxy());
+ this->flushSurfaceWrites(renderTargetContext->asRenderTargetProxy());
}
}
}
@@ -410,24 +418,31 @@
buffer = tmpPixels.get();
applyPremulToSrc = false;
}
- return fGpu->writePixels(surface, left, top, width, height, srcConfig, buffer, rowBytes);
+ return fContext->fGpu->writePixels(surface, left, top, width, height, srcConfig,
+ buffer, rowBytes);
}
return true;
}
-bool GrContext::readSurfacePixels(GrSurface* src, SkColorSpace* srcColorSpace,
- int left, int top, int width, int height,
- GrPixelConfig dstConfig, SkColorSpace* dstColorSpace,
- void* buffer, size_t rowBytes, uint32_t flags) {
+bool GrContextPriv::readSurfacePixels(GrSurfaceProxy* srcProxy, SkColorSpace* srcColorSpace,
+ int left, int top, int width, int height,
+ GrPixelConfig dstConfig, SkColorSpace* dstColorSpace,
+ void* buffer, size_t rowBytes, uint32_t flags) {
// TODO: Color space conversion
- ASSERT_SINGLE_OWNER
- RETURN_FALSE_IF_ABANDONED
- ASSERT_OWNED_RESOURCE(src);
- SkASSERT(src);
- GR_AUDIT_TRAIL_AUTO_FRAME(&fAuditTrail, "GrContext::readSurfacePixels");
+ ASSERT_SINGLE_OWNER_PRIV
+ RETURN_FALSE_IF_ABANDONED_PRIV
+ ASSERT_OWNED_PROXY_PRIV(srcProxy);
+ SkASSERT(srcProxy);
+ GR_AUDIT_TRAIL_AUTO_FRAME(&fContext->fAuditTrail, "GrContextPriv::readSurfacePixels");
- this->testPMConversionsIfNecessary(flags);
+ // MDB TODO: delay this instantiation until later in the method
+ GrSurface* src = srcProxy->instantiate(fContext->resourceProvider());
+ if (!src) {
+ return false;
+ }
+
+ fContext->testPMConversionsIfNecessary(flags);
// Adjust the params so that if we wind up using an intermediate surface we've already done
// all the trimming and the temporary can be the min size required.
@@ -438,7 +453,7 @@
}
if (!(kDontFlush_PixelOpsFlag & flags) && src->surfacePriv().hasPendingWrite()) {
- this->contextPriv().flush(nullptr); // MDB TODO: tighten this
+ this->flush(nullptr); // MDB TODO: tighten this
}
bool unpremul = SkToBool(kUnpremul_PixelOpsFlag & flags);
@@ -454,18 +469,17 @@
GrGpu::DrawPreference drawPreference = GrGpu::kNoDraw_DrawPreference;
// Don't prefer to draw for the conversion (and thereby access a texture from the cache) when
// we've already determined that there isn't a roundtrip preserving conversion processor pair.
- if (unpremul && this->validPMUPMConversionExists(src->config())) {
+ if (unpremul && fContext->validPMUPMConversionExists(src->config())) {
drawPreference = GrGpu::kCallerPrefersDraw_DrawPreference;
}
GrGpu::ReadPixelTempDrawInfo tempDrawInfo;
- if (!fGpu->getReadPixelsInfo(src, width, height, rowBytes, dstConfig, &drawPreference,
- &tempDrawInfo)) {
+ if (!fContext->fGpu->getReadPixelsInfo(src, width, height, rowBytes, dstConfig,
+ &drawPreference, &tempDrawInfo)) {
return false;
}
- sk_sp<GrSurface> surfaceToRead(SkRef(src));
- sk_sp<GrTextureProxy> drawnProxy;
+ sk_sp<GrSurfaceProxy> proxyToRead = sk_ref_sp(srcProxy);
bool didTempDraw = false;
if (GrGpu::kNoDraw_DrawPreference != drawPreference) {
if (SkBackingFit::kExact == tempDrawInfo.fTempSurfaceFit) {
@@ -478,7 +492,7 @@
// TODO: Need to decide the semantics of this function for color spaces. Do we support
// conversion to a passed-in color space? For now, specifying nullptr means that this
// path will do no conversion, so it will match the behavior of the non-draw path.
- sk_sp<GrRenderTargetContext> tempRTC = this->makeRenderTargetContext(
+ sk_sp<GrRenderTargetContext> tempRTC = fContext->makeRenderTargetContext(
tempDrawInfo.fTempSurfaceFit,
tempDrawInfo.fTempSurfaceDesc.fWidth,
tempDrawInfo.fTempSurfaceDesc.fHeight,
@@ -488,10 +502,10 @@
tempDrawInfo.fTempSurfaceDesc.fOrigin);
if (tempRTC) {
SkMatrix textureMatrix = SkMatrix::MakeTrans(SkIntToScalar(left), SkIntToScalar(top));
- sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeWrapped(sk_ref_sp(src->asTexture()));
+ sk_sp<GrTextureProxy> proxy = sk_ref_sp(srcProxy->asTextureProxy());
sk_sp<GrFragmentProcessor> fp;
if (unpremul) {
- fp = this->createPMToUPMEffect(proxy, textureMatrix);
+ fp = fContext->createPMToUPMEffect(proxy, textureMatrix);
fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), tempDrawInfo.fSwizzle);
if (fp) {
unpremul = false; // we no longer need to do this on CPU after the read back.
@@ -502,7 +516,7 @@
}
}
if (!fp && tempRTC) {
- fp = GrSimpleTextureEffect::Make(this->resourceProvider(), std::move(proxy),
+ fp = GrSimpleTextureEffect::Make(fContext->resourceProvider(), std::move(proxy),
nullptr, textureMatrix);
fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), tempDrawInfo.fSwizzle);
}
@@ -514,8 +528,7 @@
SkRect rect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height));
tempRTC->drawRect(GrNoClip(), std::move(paint), GrAA::kNo, SkMatrix::I(), rect,
nullptr);
- drawnProxy = tempRTC->asTextureProxyRef();
- surfaceToRead = sk_ref_sp(drawnProxy->instantiate(this->resourceProvider()));
+ proxyToRead = tempRTC->asTextureProxyRef();
left = 0;
top = 0;
didTempDraw = true;
@@ -523,6 +536,11 @@
}
}
+ if (!proxyToRead) {
+ return false;
+ }
+
+ GrSurface* surfaceToRead = proxyToRead->instantiate(fContext->resourceProvider());
if (!surfaceToRead) {
return false;
}
@@ -532,11 +550,11 @@
}
GrPixelConfig configToRead = dstConfig;
if (didTempDraw) {
- this->contextPriv().flushSurfaceWrites(drawnProxy.get());
+ this->flushSurfaceWrites(proxyToRead.get());
configToRead = tempDrawInfo.fReadConfig;
}
- if (!fGpu->readPixels(surfaceToRead.get(), left, top, width, height, configToRead, buffer,
- rowBytes)) {
+ if (!fContext->fGpu->readPixels(surfaceToRead, left, top, width, height, configToRead,
+ buffer, rowBytes)) {
return false;
}
@@ -815,7 +833,7 @@
sk_sp<GrTexture> tex;
if (SkBackingFit::kExact == fit) {
- tex.reset(this->resourceProvider()->createTexture(desc, budgeted));
+ tex = this->resourceProvider()->createTexture(desc, budgeted);
} else {
tex.reset(this->resourceProvider()->createApproxTexture(desc, 0));
}
@@ -878,7 +896,7 @@
void GrContext::testPMConversionsIfNecessary(uint32_t flags) {
ASSERT_SINGLE_OWNER
- if (SkToBool(kUnpremul_PixelOpsFlag & flags)) {
+ if (SkToBool(GrContextPriv::kUnpremul_PixelOpsFlag & flags)) {
if (!fDidTestPMConversions) {
test_pm_conversions(this, &fPMToUPMConversion, &fUPMToPMConversion);
fDidTestPMConversions = true;
diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrContextPriv.h
index 0f77ec2..369e8e7 100644
--- a/src/gpu/GrContextPriv.h
+++ b/src/gpu/GrContextPriv.h
@@ -96,6 +96,68 @@
*/
void prepareSurfaceForExternalIO(GrSurfaceProxy*);
+ /**
+ * These flags can be used with the read/write pixels functions below.
+ */
+ enum PixelOpsFlags {
+ /** The GrContext will not be flushed before the surface read or write. This means that
+ the read or write may occur before previous draws have executed. */
+ kDontFlush_PixelOpsFlag = 0x1,
+ /** Any surface writes should be flushed to the backend 3D API after the surface operation
+ is complete */
+ kFlushWrites_PixelOp = 0x2,
+ /** The src for write or dst read is unpremultiplied. This is only respected if both the
+ config src and dst configs are an RGBA/BGRA 8888 format. */
+ kUnpremul_PixelOpsFlag = 0x4,
+ };
+
+ /**
+ * Reads a rectangle of pixels from a surface.
+ * @param surface the surface to read from.
+ * @param srcColorSpace color space of the surface
+ * @param left left edge of the rectangle to read (inclusive)
+ * @param top top edge of the rectangle to read (inclusive)
+ * @param width width of rectangle to read in pixels.
+ * @param height height of rectangle to read in pixels.
+ * @param config the pixel config of the destination buffer
+ * @param dstColorSpace color space of the destination buffer
+ * @param buffer memory to read the rectangle into.
+ * @param rowBytes number of bytes bewtween consecutive rows. Zero means rows are tightly
+ * packed.
+ * @param pixelOpsFlags see PixelOpsFlags enum above.
+ *
+ * @return true if the read succeeded, false if not. The read can fail because of an unsupported
+ * pixel configs
+ */
+ bool readSurfacePixels(GrSurfaceProxy* src, SkColorSpace* srcColorSpace,
+ int left, int top, int width, int height,
+ GrPixelConfig config, SkColorSpace* dstColorSpace, void* buffer,
+ size_t rowBytes = 0,
+ uint32_t pixelOpsFlags = 0);
+
+ /**
+ * Writes a rectangle of pixels to a surface.
+ * @param surface the surface to write to.
+ * @param dstColorSpace color space of the surface
+ * @param left left edge of the rectangle to write (inclusive)
+ * @param top top edge of the rectangle to write (inclusive)
+ * @param width width of rectangle to write in pixels.
+ * @param height height of rectangle to write in pixels.
+ * @param config the pixel config of the source buffer
+ * @param srcColorSpace color space of the source buffer
+ * @param buffer memory to read pixels from
+ * @param rowBytes number of bytes between consecutive rows. Zero
+ * means rows are tightly packed.
+ * @param pixelOpsFlags see PixelOpsFlags enum above.
+ * @return true if the write succeeded, false if not. The write can fail because of an
+ * unsupported combination of surface and src configs.
+ */
+ bool writeSurfacePixels(GrSurfaceProxy* src, SkColorSpace* dstColorSpace,
+ int left, int top, int width, int height,
+ GrPixelConfig config, SkColorSpace* srcColorSpace, const void* buffer,
+ size_t rowBytes,
+ uint32_t pixelOpsFlags = 0);
+
private:
explicit GrContextPriv(GrContext* context) : fContext(context) {}
GrContextPriv(const GrContextPriv&); // unimpl
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index 8ef09a4..76a67c0 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -8,6 +8,7 @@
#include "GrRenderTargetContext.h"
#include "GrAppliedClip.h"
#include "GrColor.h"
+#include "GrContextPriv.h"
#include "GrDrawingManager.h"
#include "GrFixedClip.h"
#include "GrGpuResourcePriv.h"
@@ -162,18 +163,14 @@
// TODO: this seems to duplicate code in SkImage_Gpu::onReadPixels
if (kUnpremul_SkAlphaType == dstInfo.alphaType()) {
- flags |= GrContext::kUnpremul_PixelOpsFlag;
+ flags |= GrContextPriv::kUnpremul_PixelOpsFlag;
}
- // Deferral of the VRAM resources must end in this instance anyway
- sk_sp<GrRenderTarget> rt(
- sk_ref_sp(fRenderTargetProxy->instantiate(fContext->resourceProvider())));
- if (!rt) {
- return false;
- }
-
- return rt->readPixels(this->getColorSpace(), x, y, dstInfo.width(), dstInfo.height(),
- config, dstInfo.colorSpace(), dstBuffer, dstRowBytes, flags);
+ return fContext->contextPriv().readSurfacePixels(fRenderTargetProxy.get(),
+ this->getColorSpace(), x, y,
+ dstInfo.width(), dstInfo.height(), config,
+ dstInfo.colorSpace(),
+ dstBuffer, dstRowBytes, flags);
}
// TODO: move this (and GrTextureContext::onReadPixels) to GrSurfaceContext?
@@ -185,18 +182,14 @@
return false;
}
if (kUnpremul_SkAlphaType == srcInfo.alphaType()) {
- flags |= GrContext::kUnpremul_PixelOpsFlag;
+ flags |= GrContextPriv::kUnpremul_PixelOpsFlag;
}
- // Deferral of the VRAM resources must end in this instance anyway
- sk_sp<GrRenderTarget> rt(
- sk_ref_sp(fRenderTargetProxy->instantiate(fContext->resourceProvider())));
- if (!rt) {
- return false;
- }
-
- return rt->writePixels(this->getColorSpace(), x, y, srcInfo.width(), srcInfo.height(),
- config, srcInfo.colorSpace(), srcBuffer, srcRowBytes, flags);
+ return fContext->contextPriv().writeSurfacePixels(fRenderTargetProxy.get(),
+ this->getColorSpace(), x, y,
+ srcInfo.width(), srcInfo.height(),
+ config, srcInfo.colorSpace(),
+ srcBuffer, srcRowBytes, flags);
}
@@ -1787,7 +1780,7 @@
desc.fHeight = rt->height();
dstPoint = {copyRect.fLeft, copyRect.fTop};
dstOffset = {0, 0};
- copy.reset(fContext->resourceProvider()->createTexture(desc, SkBudgeted::kYes, kFlags));
+ copy = fContext->resourceProvider()->createTexture(desc, SkBudgeted::kYes, kFlags);
} else {
desc.fWidth = copyRect.width();
desc.fHeight = copyRect.height();
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index 42f5e29..0cb71c5 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -10,6 +10,7 @@
#include "GrBuffer.h"
#include "GrCaps.h"
#include "GrContext.h"
+#include "GrContextPriv.h"
#include "GrGpu.h"
#include "GrPathRendering.h"
#include "GrRenderTarget.h"
@@ -47,9 +48,13 @@
return proxy->priv().isExact() || (SkIsPow2(proxy->width()) && SkIsPow2(proxy->height()));
}
-GrTexture* GrResourceProvider::createMipMappedTexture(const GrSurfaceDesc& desc,
- SkBudgeted budgeted, const GrMipLevel* texels,
- int mipLevelCount, uint32_t flags,
+// MDB TODO: this should probably be a factory on GrSurfaceProxy
+sk_sp<GrTextureProxy> GrResourceProvider::createMipMappedTexture(
+ const GrSurfaceDesc& desc,
+ SkBudgeted budgeted,
+ const GrMipLevel* texels,
+ int mipLevelCount,
+ uint32_t flags,
SkDestinationSurfaceColorMode mipColorMode) {
ASSERT_SINGLE_OWNER
@@ -74,17 +79,19 @@
if (!GrPixelConfigIsCompressed(desc.fConfig)) {
if (mipLevelCount < 2) {
flags |= kExact_Flag | kNoCreate_Flag;
- if (GrTexture* texture = this->refScratchTexture(desc, flags)) {
+ sk_sp<GrTexture> tex(this->refScratchTexture(desc, flags));
+ if (tex) {
+ sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeWrapped(tex);
if (!mipLevelCount ||
- texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
- texels[0].fPixels, texels[0].fRowBytes)) {
+ fGpu->getContext()->contextPriv().writeSurfacePixels(
+ proxy.get(), nullptr, 0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
+ nullptr, texels[0].fPixels, texels[0].fRowBytes)) {
if (SkBudgeted::kNo == budgeted) {
- texture->resourcePriv().makeUnbudgeted();
+ tex->resourcePriv().makeUnbudgeted();
}
- texture->texturePriv().setMipColorMode(mipColorMode);
- return texture;
+ tex->texturePriv().setMipColorMode(mipColorMode);
+ return proxy;
}
- texture->unref();
}
}
}
@@ -93,25 +100,34 @@
for (int i = 0; i < mipLevelCount; ++i) {
texelsShallowCopy.push_back(texels[i]);
}
- GrTexture* texture = fGpu->createTexture(desc, budgeted, texelsShallowCopy);
- if (texture) {
- texture->texturePriv().setMipColorMode(mipColorMode);
+ sk_sp<GrTexture> tex(fGpu->createTexture(desc, budgeted, texelsShallowCopy));
+ if (tex) {
+ tex->texturePriv().setMipColorMode(mipColorMode);
}
- return texture;
+
+ return GrSurfaceProxy::MakeWrapped(std::move(tex));
}
-GrTexture* GrResourceProvider::createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
- const void* srcData, size_t rowBytes, uint32_t flags) {
- GrMipLevel tempTexels;
- GrMipLevel* texels = nullptr;
- int levelCount = 0;
- if (srcData) {
- tempTexels.fPixels = srcData;
- tempTexels.fRowBytes = rowBytes;
- texels = &tempTexels;
- levelCount = 1;
+sk_sp<GrTexture> GrResourceProvider::createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
+ uint32_t flags) {
+ if ((desc.fFlags & kRenderTarget_GrSurfaceFlag) &&
+ !fGpu->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
+ return nullptr;
}
- return this->createMipMappedTexture(desc, budgeted, texels, levelCount, flags);
+
+ if (!GrPixelConfigIsCompressed(desc.fConfig)) {
+ flags |= kExact_Flag | kNoCreate_Flag;
+ sk_sp<GrTexture> tex(this->refScratchTexture(desc, flags));
+ if (tex) {
+ if (SkBudgeted::kNo == budgeted) {
+ tex->resourcePriv().makeUnbudgeted();
+ }
+ return tex;
+ }
+ }
+
+ sk_sp<GrTexture> tex(fGpu->createTexture(desc, budgeted));
+ return tex;
}
GrTexture* GrResourceProvider::createApproxTexture(const GrSurfaceDesc& desc, uint32_t flags) {
diff --git a/src/gpu/GrResourceProvider.h b/src/gpu/GrResourceProvider.h
index a4abd72..5cb64e0 100644
--- a/src/gpu/GrResourceProvider.h
+++ b/src/gpu/GrResourceProvider.h
@@ -47,29 +47,12 @@
* @param texels A contiguous array of mipmap levels
* @param mipLevelCount The amount of elements in the texels array
*/
- GrTexture* createMipMappedTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
- const GrMipLevel* texels, int mipLevelCount,
- uint32_t flags = 0,
- SkDestinationSurfaceColorMode mipColorMode =
+ sk_sp<GrTextureProxy> createMipMappedTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
+ const GrMipLevel* texels, int mipLevelCount,
+ uint32_t flags = 0,
+ SkDestinationSurfaceColorMode mipColorMode =
SkDestinationSurfaceColorMode::kLegacy);
- /**
- * This function is a shim which creates a SkTArray<GrMipLevel> of size 1.
- * It then calls createTexture with that SkTArray.
- *
- * @param srcData Pointer to the pixel values (optional).
- * @param rowBytes The number of bytes between rows of the texture. Zero
- * implies tightly packed rows. For compressed pixel configs, this
- * field is ignored.
- */
- GrTexture* createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted, const void* srcData,
- size_t rowBytes, uint32_t flags = 0);
-
- /** Shortcut for creating a texture with no initial data to upload. */
- GrTexture* createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted, uint32_t flags = 0) {
- return this->createTexture(desc, budgeted, nullptr, 0, flags);
- }
-
/** Assigns a unique key to the texture. The texture will be findable via this key using
findTextureByUniqueKey(). If an existing texture has this key, it's key will be removed. */
void assignUniqueKeyToProxy(const GrUniqueKey& key, GrTextureProxy*);
@@ -86,6 +69,11 @@
*/
GrTexture* createApproxTexture(const GrSurfaceDesc&, uint32_t flags);
+ /** Create an exact fit texture with no initial data to upload.
+ */
+ sk_sp<GrTexture> createTexture(const GrSurfaceDesc& desc, SkBudgeted budgeted,
+ uint32_t flags = 0);
+
///////////////////////////////////////////////////////////////////////////
// Wrapped Backend Surfaces
diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp
index 49753af..4c9e3b4 100644
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -139,30 +139,6 @@
//////////////////////////////////////////////////////////////////////////////
-bool GrSurface::writePixels(SkColorSpace* dstColorSpace, int left, int top, int width, int height,
- GrPixelConfig config, SkColorSpace* srcColorSpace, const void* buffer,
- size_t rowBytes, uint32_t pixelOpsFlags) {
- // go through context so that all necessary flushing occurs
- GrContext* context = this->getContext();
- if (nullptr == context) {
- return false;
- }
- return context->writeSurfacePixels(this, dstColorSpace, left, top, width, height, config,
- srcColorSpace, buffer, rowBytes, pixelOpsFlags);
-}
-
-bool GrSurface::readPixels(SkColorSpace* srcColorSpace, int left, int top, int width, int height,
- GrPixelConfig config, SkColorSpace* dstColorSpace, void* buffer,
- size_t rowBytes, uint32_t pixelOpsFlags) {
- // go through context so that all necessary flushing occurs
- GrContext* context = this->getContext();
- if (nullptr == context) {
- return false;
- }
- return context->readSurfacePixels(this, srcColorSpace, left, top, width, height, config,
- dstColorSpace, buffer, rowBytes, pixelOpsFlags);
-}
-
bool GrSurface::hasPendingRead() const {
const GrTexture* thisTex = this->asTexture();
if (thisTex && thisTex->internalHasPendingRead()) {
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index 2506540..c243086 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -46,7 +46,7 @@
if (SkBackingFit::kApprox == fFit) {
fTarget = resourceProvider->createApproxTexture(fDesc, fFlags);
} else {
- fTarget = resourceProvider->createTexture(fDesc, fBudgeted, fFlags);
+ fTarget = resourceProvider->createTexture(fDesc, fBudgeted, fFlags).release();
}
if (!fTarget) {
return nullptr;
@@ -216,9 +216,16 @@
const void* srcData,
size_t rowBytes) {
if (srcData) {
- // If we have srcData, for now, we create a wrapped GrTextureProxy
- sk_sp<GrTexture> tex(resourceProvider->createTexture(desc, budgeted, srcData, rowBytes));
- return GrSurfaceProxy::MakeWrapped(std::move(tex));
+ GrMipLevel tempTexels;
+ GrMipLevel* texels = nullptr;
+ int levelCount = 0;
+ if (srcData) {
+ tempTexels.fPixels = srcData;
+ tempTexels.fRowBytes = rowBytes;
+ texels = &tempTexels;
+ levelCount = 1;
+ }
+ return resourceProvider->createMipMappedTexture(desc, budgeted, texels, levelCount);
}
return GrSurfaceProxy::MakeDeferred(resourceProvider, desc, SkBackingFit::kExact, budgeted);
diff --git a/src/gpu/GrTextureContext.cpp b/src/gpu/GrTextureContext.cpp
index 00cc97c..f946290 100644
--- a/src/gpu/GrTextureContext.cpp
+++ b/src/gpu/GrTextureContext.cpp
@@ -120,17 +120,14 @@
// TODO: this seems to duplicate code in SkImage_Gpu::onReadPixels
if (kUnpremul_SkAlphaType == dstInfo.alphaType()) {
- flags |= GrContext::kUnpremul_PixelOpsFlag;
+ flags |= GrContextPriv::kUnpremul_PixelOpsFlag;
}
- // Deferral of the VRAM resources must end in this instance anyway
- sk_sp<GrTexture> tex(sk_ref_sp(fTextureProxy->instantiate(fContext->resourceProvider())));
- if (!tex) {
- return false;
- }
-
- return tex->readPixels(this->getColorSpace(), x, y, dstInfo.width(), dstInfo.height(),
- config, dstInfo.colorSpace(), dstBuffer, dstRowBytes, flags);
+ return fContext->contextPriv().readSurfacePixels(fTextureProxy.get(), this->getColorSpace(),
+ x, y, dstInfo.width(), dstInfo.height(),
+ config,
+ dstInfo.colorSpace(), dstBuffer, dstRowBytes,
+ flags);
}
// TODO: move this (and GrRenderTargetContext::onReadPixels) to GrSurfaceContext?
@@ -143,15 +140,12 @@
return false;
}
if (kUnpremul_SkAlphaType == srcInfo.alphaType()) {
- flags |= GrContext::kUnpremul_PixelOpsFlag;
+ flags |= GrContextPriv::kUnpremul_PixelOpsFlag;
}
- // Deferral of the VRAM resources must end in this instance anyway
- sk_sp<GrTexture> tex(sk_ref_sp(fTextureProxy->instantiate(fContext->resourceProvider())));
- if (!tex) {
- return false;
- }
-
- return tex->writePixels(this->getColorSpace(), x, y, srcInfo.width(), srcInfo.height(),
- config, srcInfo.colorSpace(), srcBuffer, srcRowBytes, flags);
+ return fContext->contextPriv().writeSurfacePixels(fTextureProxy.get(), this->getColorSpace(),
+ x, y, srcInfo.width(), srcInfo.height(),
+ config,
+ srcInfo.colorSpace(), srcBuffer, srcRowBytes,
+ flags);
}
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 56ce545..5f21e1d 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -241,13 +241,11 @@
texels[i].fRowBytes = generatedMipLevel.fPixmap.rowBytes();
}
- sk_sp<GrTexture> tex(ctx->resourceProvider()->createMipMappedTexture(desc,
- SkBudgeted::kYes,
- texels.get(),
- mipLevelCount,
- 0, colorMode));
-
- return GrSurfaceProxy::MakeWrapped(std::move(tex));
+ return ctx->resourceProvider()->createMipMappedTexture(desc,
+ SkBudgeted::kYes,
+ texels.get(),
+ mipLevelCount,
+ 0, colorMode);
}
sk_sp<GrTextureProxy> GrUploadMipMapToTextureProxy(GrContext* ctx, const SkImageInfo& info,
@@ -259,11 +257,9 @@
}
const GrCaps* caps = ctx->caps();
- sk_sp<GrTexture> tex(ctx->resourceProvider()->createMipMappedTexture(
- GrImageInfoToSurfaceDesc(info, *caps),
+ return ctx->resourceProvider()->createMipMappedTexture(GrImageInfoToSurfaceDesc(info, *caps),
SkBudgeted::kYes, texels,
- mipLevelCount, 0, colorMode));
- return GrSurfaceProxy::MakeWrapped(std::move(tex));
+ mipLevelCount, 0, colorMode);
}
sk_sp<GrTextureProxy> GrRefCachedBitmapTextureProxy(GrContext* ctx,
diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp
index 5785be2..26ef596 100644
--- a/src/gpu/effects/GrTextureStripAtlas.cpp
+++ b/src/gpu/effects/GrTextureStripAtlas.cpp
@@ -162,7 +162,7 @@
// that is not currently in use
fTexContext->writePixels(bitmap.info(), bitmap.getPixels(), bitmap.rowBytes(),
0, rowNumber * fDesc.fRowHeight,
- GrContext::kDontFlush_PixelOpsFlag);
+ GrContextPriv::kDontFlush_PixelOpsFlag);
}
SkASSERT(rowNumber >= 0);
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index 9c9aaa7..08c2e0d 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -191,7 +191,7 @@
uint32_t flags = 0;
if (kUnpremul_SkAlphaType == rec.fInfo.alphaType() && kPremul_SkAlphaType == fAlphaType) {
// let the GPU perform this transformation for us
- flags = GrContext::kUnpremul_PixelOpsFlag;
+ flags = GrContextPriv::kUnpremul_PixelOpsFlag;
}
sk_sp<GrSurfaceContext> sContext = fContext->contextPriv().makeWrappedSurfaceContext(
diff --git a/tests/BlendTest.cpp b/tests/BlendTest.cpp
index 193c37d..2d16fb2 100644
--- a/tests/BlendTest.cpp
+++ b/tests/BlendTest.cpp
@@ -92,8 +92,7 @@
backingDesc.fOrigin = kDefault_GrSurfaceOrigin;
backingDesc.fFlags = kRenderTarget_GrSurfaceFlag;
- (*backingSurface)
- .reset(context->resourceProvider()->createTexture(backingDesc, SkBudgeted::kNo));
+ *backingSurface = context->resourceProvider()->createTexture(backingDesc, SkBudgeted::kNo);
GrBackendTextureDesc desc;
desc.fConfig = config;
diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp
index 4214e4e..5adc2e7 100644
--- a/tests/FloatingPointTextureTest.cpp
+++ b/tests/FloatingPointTextureTest.cpp
@@ -17,6 +17,7 @@
#if SK_SUPPORT_GPU
#include "GrContext.h"
+#include "GrContextPriv.h"
#include "GrResourceProvider.h"
#include "GrTexture.h"
#include "SkHalf.h"
@@ -51,14 +52,18 @@
desc.fHeight = DEV_H;
desc.fConfig = config;
desc.fOrigin = 0 == origin ? kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin;
- sk_sp<GrTexture> fpTexture(context->resourceProvider()->createTexture(
- desc, SkBudgeted::kNo, controlPixelData.begin(), 0));
+ sk_sp<GrTextureProxy> fpProxy = GrSurfaceProxy::MakeDeferred(context->resourceProvider(),
+ desc, SkBudgeted::kNo,
+ controlPixelData.begin(), 0);
// Floating point textures are NOT supported everywhere
- if (nullptr == fpTexture) {
+ if (!fpProxy) {
continue;
}
- REPORTER_ASSERT(reporter,
- fpTexture->readPixels(0, 0, DEV_W, DEV_H, desc.fConfig, readBuffer.begin(), 0));
+ bool result = context->contextPriv().readSurfacePixels(fpProxy.get(), nullptr,
+ 0, 0, DEV_W, DEV_H,
+ desc.fConfig, nullptr,
+ readBuffer.begin(), 0);
+ REPORTER_ASSERT(reporter, result);
REPORTER_ASSERT(reporter,
0 == memcmp(readBuffer.begin(), controlPixelData.begin(), readBuffer.bytes()));
}
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 489aec1..5400d92 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -285,28 +285,30 @@
bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) {
GrDrawingManager* drawingManager = context->contextPriv().drawingManager();
+ sk_sp<GrTextureProxy> proxies[2];
+
// setup dummy textures
GrSurfaceDesc dummyDesc;
dummyDesc.fFlags = kRenderTarget_GrSurfaceFlag;
+ dummyDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
dummyDesc.fConfig = kRGBA_8888_GrPixelConfig;
dummyDesc.fWidth = 34;
dummyDesc.fHeight = 18;
- sk_sp<GrTexture> dummyTexture1(
- context->resourceProvider()->createTexture(dummyDesc, SkBudgeted::kNo, nullptr, 0));
+ proxies[0] = GrSurfaceProxy::MakeDeferred(context->resourceProvider(),
+ dummyDesc, SkBudgeted::kNo, nullptr, 0);
dummyDesc.fFlags = kNone_GrSurfaceFlags;
+ dummyDesc.fOrigin = kTopLeft_GrSurfaceOrigin;
dummyDesc.fConfig = kAlpha_8_GrPixelConfig;
dummyDesc.fWidth = 16;
dummyDesc.fHeight = 22;
- sk_sp<GrTexture> dummyTexture2(
- context->resourceProvider()->createTexture(dummyDesc, SkBudgeted::kNo, nullptr, 0));
+ proxies[1] = GrSurfaceProxy::MakeDeferred(context->resourceProvider(),
+ dummyDesc, SkBudgeted::kNo, nullptr, 0);
- if (!dummyTexture1 || ! dummyTexture2) {
+ if (!proxies[0] || !proxies[1]) {
SkDebugf("Could not allocate dummy textures");
return false;
}
- GrTexture* dummyTextures[] = {dummyTexture1.get(), dummyTexture2.get()};
-
// dummy scissor state
GrScissorState scissor;
@@ -326,7 +328,7 @@
std::unique_ptr<GrLegacyMeshDrawOp> op(GrRandomDrawOp(&random, context));
SkASSERT(op);
- GrProcessorTestData ptd(&random, context, renderTargetContext.get(), dummyTextures);
+ GrProcessorTestData ptd(&random, context, renderTargetContext.get(), proxies);
set_random_color_coverage_stages(&grPaint, &ptd, maxStages);
set_random_xpf(&grPaint, &ptd);
bool snapToCenters = set_random_state(&grPaint, &random);
@@ -360,7 +362,7 @@
for (int j = 0; j < 10; ++j) {
std::unique_ptr<GrLegacyMeshDrawOp> op(GrRandomDrawOp(&random, context));
SkASSERT(op);
- GrProcessorTestData ptd(&random, context, renderTargetContext.get(), dummyTextures);
+ GrProcessorTestData ptd(&random, context, renderTargetContext.get(), proxies);
GrPaint grPaint;
grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc));
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index d98d0d0..97700b1 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -27,11 +27,10 @@
desc.fWidth = 256;
desc.fHeight = 256;
desc.fSampleCnt = 0;
- GrSurface* texRT1 = context->resourceProvider()->createTexture(
- desc, SkBudgeted::kNo, nullptr, 0);
+ sk_sp<GrSurface> texRT1 = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo);
- REPORTER_ASSERT(reporter, texRT1 == texRT1->asRenderTarget());
- REPORTER_ASSERT(reporter, texRT1 == texRT1->asTexture());
+ REPORTER_ASSERT(reporter, texRT1.get() == texRT1->asRenderTarget());
+ REPORTER_ASSERT(reporter, texRT1.get() == texRT1->asTexture());
REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT1->asRenderTarget()) ==
texRT1->asTexture());
REPORTER_ASSERT(reporter, texRT1->asRenderTarget() ==
@@ -40,10 +39,10 @@
static_cast<GrSurface*>(texRT1->asTexture()));
desc.fFlags = kNone_GrSurfaceFlags;
- GrSurface* tex1 = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo, nullptr, 0);
+ sk_sp<GrTexture> tex1 = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo);
REPORTER_ASSERT(reporter, nullptr == tex1->asRenderTarget());
- REPORTER_ASSERT(reporter, tex1 == tex1->asTexture());
- REPORTER_ASSERT(reporter, static_cast<GrSurface*>(tex1) == tex1->asTexture());
+ REPORTER_ASSERT(reporter, tex1.get() == tex1->asTexture());
+ REPORTER_ASSERT(reporter, static_cast<GrSurface*>(tex1.get()) == tex1->asTexture());
GrBackendObject backendTex = context->getGpu()->createTestingOnlyBackendTexture(
nullptr, 256, 256, kRGBA_8888_GrPixelConfig);
@@ -66,8 +65,6 @@
REPORTER_ASSERT(reporter, static_cast<GrSurface*>(texRT2->asRenderTarget()) ==
static_cast<GrSurface*>(texRT2->asTexture()));
- texRT1->unref();
- tex1->unref();
context->getGpu()->deleteTestingOnlyBackendTexture(backendTex);
}
diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp
index fe67925..95ade04 100644
--- a/tests/ImageFilterCacheTest.cpp
+++ b/tests/ImageFilterCacheTest.cpp
@@ -181,18 +181,6 @@
#include "GrContext.h"
#include "GrResourceProvider.h"
-static GrTexture* create_texture(GrContext* context) {
- SkBitmap srcBM = create_bm();
-
- GrSurfaceDesc desc;
- desc.fConfig = kRGBA_8888_GrPixelConfig;
- desc.fFlags = kNone_GrSurfaceFlags;
- desc.fWidth = kFullSize;
- desc.fHeight = kFullSize;
-
- return context->resourceProvider()->createTexture(desc, SkBudgeted::kNo, srcBM.getPixels(), 0);
-}
-
static sk_sp<GrTextureProxy> create_proxy(GrResourceProvider* resourceProvider) {
SkBitmap srcBM = create_bm();
@@ -208,10 +196,16 @@
srcBM.rowBytes());
}
-
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageFilterCache_ImageBackedGPU, reporter, ctxInfo) {
- sk_sp<GrTexture> srcTexture(create_texture(ctxInfo.grContext()));
- if (!srcTexture) {
+ GrContext* context = ctxInfo.grContext();
+
+ sk_sp<GrTextureProxy> srcProxy(create_proxy(context->resourceProvider()));
+ if (!srcProxy) {
+ return;
+ }
+
+ GrTexture* tex = srcProxy->instantiate(context->resourceProvider());
+ if (!tex) {
return;
}
@@ -222,8 +216,8 @@
backendDesc.fWidth = kFullSize;
backendDesc.fHeight = kFullSize;
backendDesc.fSampleCnt = 0;
- backendDesc.fTextureHandle = srcTexture->getTextureHandle();
- sk_sp<SkImage> srcImage(SkImage::MakeFromTexture(ctxInfo.grContext(),
+ backendDesc.fTextureHandle = tex->getTextureHandle();
+ sk_sp<SkImage> srcImage(SkImage::MakeFromTexture(context,
backendDesc,
kPremul_SkAlphaType));
if (!srcImage) {
diff --git a/tests/ImageStorageTest.cpp b/tests/ImageStorageTest.cpp
index 59bb38b..f3e3482 100644
--- a/tests/ImageStorageTest.cpp
+++ b/tests/ImageStorageTest.cpp
@@ -20,9 +20,17 @@
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageStorageLoad, reporter, ctxInfo) {
class TestFP : public GrFragmentProcessor {
public:
- static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTexture> texture, GrSLMemoryModel mm,
+ static sk_sp<GrFragmentProcessor> Make(GrResourceProvider* resourceProvider,
+ sk_sp<GrTextureProxy> proxy,
+ GrSLMemoryModel mm,
GrSLRestrict restrict) {
- return sk_sp<GrFragmentProcessor>(new TestFP(std::move(texture), mm, restrict));
+ // MDB TODO: remove this once ImageStorageAccess is converted to GrTextureProxy
+ sk_sp<GrTexture> tex(sk_ref_sp(proxy->instantiate(resourceProvider)));
+ if (!tex) {
+ return nullptr;
+ }
+
+ return sk_sp<GrFragmentProcessor>(new TestFP(std::move(tex), mm, restrict));
}
const char* name() const override { return "Image Load Test FP"; }
@@ -127,15 +135,17 @@
continue;
}
desc.fConfig = test.fConfig;
- sk_sp<GrTexture> imageStorageTexture(context->resourceProvider()->createTexture(
- desc, SkBudgeted::kYes, test.fData.get(), 0));
+ sk_sp<GrTextureProxy> imageStorageTexture =
+ GrSurfaceProxy::MakeDeferred(context->resourceProvider(), desc,
+ SkBudgeted::kYes, test.fData.get(), 0);
sk_sp<GrRenderTargetContext> rtContext =
context->makeRenderTargetContext(SkBackingFit::kExact, kS, kS,
kRGBA_8888_GrPixelConfig, nullptr);
GrPaint paint;
paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
- paint.addColorFragmentProcessor(TestFP::Make(imageStorageTexture, mm, restrict));
+ paint.addColorFragmentProcessor(TestFP::Make(context->resourceProvider(),
+ imageStorageTexture, mm, restrict));
rtContext->drawPaint(GrNoClip(), std::move(paint), SkMatrix::I());
std::unique_ptr<uint32_t[]> readData(new uint32_t[kS * kS]);
SkImageInfo info = SkImageInfo::Make(kS, kS, kRGBA_8888_SkColorType,
diff --git a/tests/IntTextureTest.cpp b/tests/IntTextureTest.cpp
index 8ef5731..eacd061 100644
--- a/tests/IntTextureTest.cpp
+++ b/tests/IntTextureTest.cpp
@@ -10,6 +10,7 @@
#if SK_SUPPORT_GPU
#include "GrClip.h"
#include "GrContext.h"
+#include "GrContextPriv.h"
#include "GrRenderTargetContext.h"
#include "GrResourceProvider.h"
#include "GrTexture.h"
@@ -64,7 +65,8 @@
levels[1].fPixels = testData.get();
levels[1].fRowBytes = (kS / 2) * sizeof(int32_t);
- sk_sp<GrTexture> temp(context->resourceProvider()->createMipMappedTexture(desc,
+ sk_sp<GrTextureProxy> temp(context->resourceProvider()->createMipMappedTexture(
+ desc,
SkBudgeted::kYes,
levels, 2));
REPORTER_ASSERT(reporter, !temp);
@@ -80,21 +82,21 @@
return;
}
- GrTexture* texture = proxy->instantiate(context->resourceProvider());
- REPORTER_ASSERT(reporter, texture);
- if (!texture) {
- return;
- }
-
std::unique_ptr<int32_t[]> readData(new int32_t[kS * kS]);
// Test that reading to a non-integer config fails.
{
- bool success = texture->readPixels(0, 0, kS, kS, kRGBA_8888_GrPixelConfig, readData.get());
+ bool success = context->contextPriv().readSurfacePixels(proxy.get(), nullptr,
+ 0, 0, kS, kS,
+ kRGBA_8888_GrPixelConfig,
+ nullptr, readData.get());
REPORTER_ASSERT(reporter, !success);
}
{
std::unique_ptr<uint16_t[]> halfData(new uint16_t[4 * kS * kS]);
- bool success = texture->readPixels(0, 0, kS, kS, kRGBA_half_GrPixelConfig, halfData.get());
+ bool success = context->contextPriv().readSurfacePixels(proxy.get(), nullptr,
+ 0, 0, kS, kS,
+ kRGBA_half_GrPixelConfig,
+ nullptr, halfData.get());
REPORTER_ASSERT(reporter, !success);
}
{
@@ -102,8 +104,10 @@
// we don't support. Right now this test is counting on GR_RGBA_INTEGER/GL_BYTE being the
// implementation-dependent second format).
sk_bzero(readData.get(), sizeof(int32_t) * kS * kS);
- bool success = texture->readPixels(0, 0, kS, kS, kRGBA_8888_sint_GrPixelConfig,
- readData.get());
+ bool success = context->contextPriv().readSurfacePixels(proxy.get(), nullptr,
+ 0, 0, kS, kS,
+ kRGBA_8888_sint_GrPixelConfig,
+ nullptr, readData.get());
REPORTER_ASSERT(reporter, success);
if (success) {
check_pixels(reporter, kS, kS, testData.get(), readData.get(), "readPixels");
@@ -111,8 +115,12 @@
}
{
// readPixels should fail if we attempt to use the unpremul flag with an integer texture.
- bool success = texture->readPixels(0, 0, kS, kS, kRGBA_8888_sint_GrPixelConfig,
- readData.get(), 0, GrContext::kUnpremul_PixelOpsFlag);
+ bool success = context->contextPriv().readSurfacePixels(
+ proxy.get(), nullptr,
+ 0, 0, kS, kS,
+ kRGBA_8888_sint_GrPixelConfig,
+ nullptr, readData.get(), 0,
+ GrContextPriv::kUnpremul_PixelOpsFlag);
REPORTER_ASSERT(reporter, !success);
}
@@ -125,16 +133,11 @@
return;
}
- GrSurface* copySurface = dstContext->asTextureProxy()->instantiate(
- context->resourceProvider());
- REPORTER_ASSERT(reporter, copySurface);
- if (!copySurface) {
- return;
- }
-
sk_bzero(readData.get(), sizeof(int32_t) * kS * kS);
- bool success = copySurface->readPixels(0, 0, kS, kS,
- kRGBA_8888_sint_GrPixelConfig, readData.get());
+ bool success = context->contextPriv().readSurfacePixels(dstContext->asSurfaceProxy(),
+ nullptr, 0, 0, kS, kS,
+ kRGBA_8888_sint_GrPixelConfig,
+ nullptr, readData.get());
REPORTER_ASSERT(reporter, success);
if (success) {
check_pixels(reporter, kS, kS, testData.get(), readData.get(), "copyIntegerToInteger");
@@ -168,27 +171,39 @@
{
// Can't write pixels from a non-int config.
- bool success = texture->writePixels(0, 0, kS/2, kS/2, kRGBA_8888_GrPixelConfig,
- bottomRightQuarter, kRowBytes);
+ bool success = context->contextPriv().writeSurfacePixels(proxy.get(), nullptr,
+ 0, 0, kS/2, kS/2,
+ kRGBA_8888_GrPixelConfig, nullptr,
+ bottomRightQuarter, kRowBytes);
REPORTER_ASSERT(reporter, !success);
}
{
// Can't use unpremul flag.
- bool success = texture->writePixels(0, 0, kS/2, kS/2, kRGBA_8888_sint_GrPixelConfig,
+ bool success = context->contextPriv().writeSurfacePixels(
+ proxy.get(), nullptr,
+ 0, 0, kS/2, kS/2,
+ kRGBA_8888_sint_GrPixelConfig,
+ nullptr,
bottomRightQuarter, kRowBytes,
- GrContext::kUnpremul_PixelOpsFlag);
+ GrContextPriv::kUnpremul_PixelOpsFlag);
REPORTER_ASSERT(reporter, !success);
}
{
- bool success = texture->writePixels(0, 0, kS/2, kS/2, kRGBA_8888_sint_GrPixelConfig,
- bottomRightQuarter, kRowBytes);
+ bool success = context->contextPriv().writeSurfacePixels(proxy.get(), nullptr,
+ 0, 0, kS/2, kS/2,
+ kRGBA_8888_sint_GrPixelConfig,
+ nullptr,
+ bottomRightQuarter, kRowBytes);
REPORTER_ASSERT(reporter, success);
if (!success) {
return;
}
sk_bzero(readData.get(), sizeof(int32_t) * kS * kS);
- success = texture->readPixels(0, 0, kS, kS, kRGBA_8888_sint_GrPixelConfig, readData.get());
+ success = context->contextPriv().readSurfacePixels(proxy.get(), nullptr,
+ 0, 0, kS, kS,
+ kRGBA_8888_sint_GrPixelConfig,
+ nullptr, readData.get(), 0);
REPORTER_ASSERT(reporter, success);
if (!success) {
return;
@@ -219,10 +234,10 @@
expectedData.get()[i] = ((0xFF * a) << 24) | ((0xFF * b) << 16) |
((0xFF * g) << 8) | (0xFF * r);
}
- texture->writePixels(0, 0, kS, kS, kRGBA_8888_sint_GrPixelConfig, testData.get());
-
- sk_sp<GrTextureProxy> intTextureProxy = GrSurfaceProxy::MakeWrapped(sk_ref_sp(texture));
- texture = nullptr; // unused from here on out
+ context->contextPriv().writeSurfacePixels(proxy.get(), nullptr,
+ 0, 0, kS, kS,
+ kRGBA_8888_sint_GrPixelConfig, nullptr,
+ testData.get(), 0);
sk_sp<GrRenderTargetContext> rtContext = context->makeRenderTargetContext(
SkBackingFit::kExact, kS, kS, kRGBA_8888_GrPixelConfig, nullptr);
@@ -238,7 +253,7 @@
for (auto filter : kNamedFilters) {
sk_sp<GrFragmentProcessor> fp(GrSimpleTextureEffect::Make(context->resourceProvider(),
- intTextureProxy, nullptr,
+ proxy, nullptr,
SkMatrix::I(),
filter.fMode));
REPORTER_ASSERT(reporter, fp);
diff --git a/tests/PackedConfigsTextureTest.cpp b/tests/PackedConfigsTextureTest.cpp
index 7a51651..35d9dfc 100644
--- a/tests/PackedConfigsTextureTest.cpp
+++ b/tests/PackedConfigsTextureTest.cpp
@@ -15,6 +15,7 @@
#if SK_SUPPORT_GPU
#include "GrContext.h"
+#include "GrContextPriv.h"
#include "GrResourceProvider.h"
#include "GrTexture.h"
@@ -116,10 +117,13 @@
desc.fHeight = DEV_H;
desc.fConfig = config;
desc.fOrigin = 0 == origin ? kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin;
- sk_sp<GrTexture> fpTexture(context->resourceProvider()->createTexture(
- desc, SkBudgeted::kNo, controlPixelData.begin(), 0));
- SkASSERT(fpTexture);
- fpTexture->readPixels(0, 0, DEV_W, DEV_H, kRGBA_8888_GrPixelConfig, readBuffer.begin(), 0);
+ sk_sp<GrTextureProxy> fpProxy = GrSurfaceProxy::MakeDeferred(context->resourceProvider(),
+ desc, SkBudgeted::kNo,
+ controlPixelData.begin(), 0);
+ SkASSERT(fpProxy);
+ context->contextPriv().readSurfacePixels(fpProxy.get(), nullptr, 0, 0, DEV_W, DEV_H,
+ kRGBA_8888_GrPixelConfig, nullptr,
+ readBuffer.begin(), 0);
if (kRGBA_4444_GrPixelConfig == config) {
check_4444(reporter, controlPixelData, readBuffer);
} else {
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index b8691f2..3eb4e16 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -146,12 +146,12 @@
desc,
SkBackingFit::kExact,
SkBudgeted::kYes));
- sk_sp<GrTexture> texture2(
- context->resourceProvider()->createTexture(desc, SkBudgeted::kYes));
- sk_sp<GrTexture> texture3(
- context->resourceProvider()->createTexture(desc, SkBudgeted::kYes));
- sk_sp<GrTexture> texture4(
- context->resourceProvider()->createTexture(desc, SkBudgeted::kYes));
+ sk_sp<GrTexture> texture2 =
+ context->resourceProvider()->createTexture(desc, SkBudgeted::kYes);
+ sk_sp<GrTexture> texture3 =
+ context->resourceProvider()->createTexture(desc, SkBudgeted::kYes);
+ sk_sp<GrTexture> texture4 =
+ context->resourceProvider()->createTexture(desc, SkBudgeted::kYes);
sk_sp<GrBuffer> buffer(texelBufferSupport
? context->resourceProvider()->createBuffer(
1024, GrBufferType::kTexel_GrBufferType,
@@ -298,6 +298,8 @@
desc.fFlags = kRenderTarget_GrSurfaceFlag;
desc.fConfig = kRGBA_8888_GrPixelConfig;
+ sk_sp<GrTextureProxy> proxies[2];
+
// Put premul data into the RGBA texture that the test FPs can optionally use.
std::unique_ptr<GrColor[]> rgbaData(new GrColor[256 * 256]);
for (int y = 0; y < 256; ++y) {
@@ -306,8 +308,8 @@
texel_color(random.nextULessThan(256), random.nextULessThan(256));
}
}
- sk_sp<GrTexture> tex0(context->resourceProvider()->createTexture(
- desc, SkBudgeted::kYes, rgbaData.get(), 256 * sizeof(GrColor)));
+ proxies[0] = GrSurfaceProxy::MakeDeferred(context->resourceProvider(), desc, SkBudgeted::kYes,
+ rgbaData.get(), 256 * sizeof(GrColor));
// Put random values into the alpha texture that the test FPs can optionally use.
desc.fConfig = kAlpha_8_GrPixelConfig;
@@ -317,10 +319,9 @@
alphaData.get()[256 * y + x] = random.nextULessThan(256);
}
}
- sk_sp<GrTexture> tex1(context->resourceProvider()->createTexture(desc, SkBudgeted::kYes,
- alphaData.get(), 256));
- GrTexture* textures[] = {tex0.get(), tex1.get()};
- GrProcessorTestData testData(&random, context, rtc.get(), textures);
+ proxies[1] = GrSurfaceProxy::MakeDeferred(context->resourceProvider(), desc, SkBudgeted::kYes,
+ alphaData.get(), 256);
+ GrProcessorTestData testData(&random, context, rtc.get(), proxies);
// Use a different array of premul colors for the output of the fragment processor that preceeds
// the fragment processor under test.
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 648ae1d..7657e28 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -137,7 +137,7 @@
if (SkBackingFit::kApprox == fit) {
tex.reset(provider->createApproxTexture(desc, 0));
} else {
- tex.reset(provider->createTexture(desc, budgeted));
+ tex = provider->createTexture(desc, budgeted);
}
sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred(
@@ -170,7 +170,7 @@
if (SkBackingFit::kApprox == fit) {
tex.reset(provider->createApproxTexture(desc, 0));
} else {
- tex.reset(provider->createTexture(desc, budgeted));
+ tex = provider->createTexture(desc, budgeted);
}
sk_sp<GrTextureProxy> proxy(GrSurfaceProxy::MakeDeferred(provider,
@@ -249,7 +249,7 @@
// Internal offscreen render target.
if (renderable) {
desc.fFlags = kRenderTarget_GrSurfaceFlag;
- tex.reset(provider->createTexture(desc, budgeted));
+ tex = provider->createTexture(desc, budgeted);
sk_sp<GrRenderTarget> rt(sk_ref_sp(tex->asRenderTarget()));
sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(rt));
@@ -264,7 +264,7 @@
if (!tex) {
SkASSERT(kNone_GrSurfaceFlags == desc.fFlags );
desc.fSampleCnt = 0;
- tex.reset(provider->createTexture(desc, budgeted));
+ tex = provider->createTexture(desc, budgeted);
}
sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(tex));
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 774f0af..c67e62b 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -16,6 +16,7 @@
#if SK_SUPPORT_GPU
#include "GrContext.h"
+#include "GrContextPriv.h"
#include "GrResourceProvider.h"
#include "SkGr.h"
#endif
@@ -123,11 +124,16 @@
}
#if SK_SUPPORT_GPU
-static void fill_src_texture(GrTexture* texture) {
+static void fill_src_texture(GrContext* context, GrTextureProxy* proxy) {
SkBitmap bmp = make_src_bitmap();
bmp.lockPixels();
- texture->writePixels(0, 0, DEV_W, DEV_H, kSkia8888_GrPixelConfig, bmp.getPixels(),
- bmp.rowBytes());
+
+ SkDEBUGCODE(bool result =) context->contextPriv().writeSurfacePixels(
+ proxy, nullptr,
+ 0, 0, DEV_W, DEV_H,
+ kSkia8888_GrPixelConfig, nullptr,
+ bmp.getPixels(), bmp.rowBytes());
+ SkASSERT(result);
bmp.unlockPixels();
}
#endif
@@ -436,8 +442,9 @@
#endif
#if SK_SUPPORT_GPU
-static void test_readpixels_texture(skiatest::Reporter* reporter, GrTexture* texture) {
- fill_src_texture(texture);
+static void test_readpixels_texture(skiatest::Reporter* reporter,
+ GrContext* context, sk_sp<GrTextureProxy> proxy) {
+ fill_src_texture(context, proxy.get());
for (size_t rect = 0; rect < SK_ARRAY_COUNT(gReadPixelsTestRects); ++rect) {
const SkIRect& srcRect = gReadPixelsTestRects[rect];
for (BitmapInit bmi = kFirstBitmapInit; bmi <= kLast_BitmapInit; bmi = nextBMI(bmi)) {
@@ -452,16 +459,18 @@
// Try doing the read directly from a non-renderable texture
if (startsWithPixels) {
fill_dst_bmp_with_init_data(&bmp);
- GrPixelConfig dstConfig =
- SkImageInfo2GrPixelConfig(bmp.info(), *texture->getContext()->caps());
+ GrPixelConfig dstConfig = SkImageInfo2GrPixelConfig(bmp.info(),
+ *context->caps());
uint32_t flags = 0;
if (gReadPixelsConfigs[c].fAlphaType == kUnpremul_SkAlphaType) {
- flags = GrContext::kUnpremul_PixelOpsFlag;
+ flags = GrContextPriv::kUnpremul_PixelOpsFlag;
}
bmp.lockPixels();
- bool success = texture->readPixels(srcRect.fLeft, srcRect.fTop, bmp.width(),
- bmp.height(), dstConfig, bmp.getPixels(),
- bmp.rowBytes(), flags);
+ bool success = context->contextPriv().readSurfacePixels(
+ proxy.get(), nullptr,
+ srcRect.fLeft, srcRect.fTop, bmp.width(),
+ bmp.height(), dstConfig, nullptr,
+ bmp.getPixels(), bmp.rowBytes(), flags);
bmp.unlockPixels();
check_read(reporter, bmp, srcRect.fLeft, srcRect.fTop,
success, true,
@@ -481,9 +490,10 @@
desc.fHeight = DEV_H;
desc.fConfig = kSkia8888_GrPixelConfig;
desc.fOrigin = origin;
- sk_sp<GrTexture> texture(ctxInfo.grContext()->resourceProvider()->createTexture(desc,
- SkBudgeted::kNo));
- test_readpixels_texture(reporter, texture.get());
+ sk_sp<GrTexture> texture =
+ ctxInfo.grContext()->resourceProvider()->createTexture(desc, SkBudgeted::kNo);
+ test_readpixels_texture(reporter, ctxInfo.grContext(),
+ GrSurfaceProxy::MakeWrapped(std::move(texture)));
}
}
}
diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp
index ac34b9d..2a68191 100644
--- a/tests/ReadWriteAlphaTest.cpp
+++ b/tests/ReadWriteAlphaTest.cpp
@@ -159,9 +159,10 @@
rgbaData[y * X_SIZE + x] = GrColorPackRGBA(6, 7, 8, alphaData[y * X_SIZE + x]);
}
}
- sk_sp<GrTexture> texture(
- context->resourceProvider()->createTexture(desc, SkBudgeted::kNo, rgbaData, 0));
- if (!texture) {
+ sk_sp<GrTextureProxy> proxy =
+ GrSurfaceProxy::MakeDeferred(context->resourceProvider(), desc, SkBudgeted::kNo,
+ rgbaData, 0);
+ if (!proxy) {
// We always expect to be able to create a RGBA texture
if (!rt && kRGBA_8888_GrPixelConfig == desc.fConfig) {
ERRORF(reporter, "Failed to create RGBA texture.");
@@ -177,8 +178,10 @@
memset(readback.get(), kClearValue, nonZeroRowBytes * Y_SIZE);
// read the texture back
- bool result = texture->readPixels(0, 0, desc.fWidth, desc.fHeight,
- kAlpha_8_GrPixelConfig,
+ bool result = context->contextPriv().readSurfacePixels(
+ proxy.get(), nullptr,
+ 0, 0, desc.fWidth, desc.fHeight,
+ kAlpha_8_GrPixelConfig, nullptr,
readback.get(), rowBytes);
REPORTER_ASSERT_MESSAGE(reporter, result, "8888 readPixels failed");
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index a7a2b45..fcf3fe8 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -184,7 +184,7 @@
smallMSAART0 && smallMSAART0->asRenderTarget() &&
smallMSAART0->asRenderTarget()->numColorSamples() < 8) {
smallMSAADesc.fSampleCnt = 8;
- smallMSAART1.reset(resourceProvider->createTexture(smallMSAADesc, SkBudgeted::kNo));
+ smallMSAART1 = resourceProvider->createTexture(smallMSAADesc, SkBudgeted::kNo);
sk_sp<GrTexture> smallMSAART1(
resourceProvider->createTexture(smallMSAADesc, SkBudgeted::kNo));
if (smallMSAART1 && smallMSAART1->asRenderTarget()) {
@@ -1514,13 +1514,13 @@
desc.fConfig = kRGBA_8888_GrPixelConfig;
desc.fSampleCnt = sampleCnt;
- return sk_sp<GrTexture>(provider->createTexture(desc, SkBudgeted::kYes));
+ return provider->createTexture(desc, SkBudgeted::kYes);
}
-static sk_sp<GrTexture> make_mipmap_texture(GrResourceProvider* provider,
- GrSurfaceFlags flags,
- int width, int height,
- int sampleCnt) {
+static sk_sp<GrTextureProxy> make_mipmap_proxy(GrResourceProvider* provider,
+ GrSurfaceFlags flags,
+ int width, int height,
+ int sampleCnt) {
SkBitmap bm;
bm.allocN32Pixels(width, height, true);
@@ -1552,8 +1552,7 @@
desc.fSampleCnt = sampleCnt;
desc.fIsMipMapped = true;
- return sk_sp<GrTexture>(provider->createMipMappedTexture(desc, SkBudgeted::kYes,
- texels.get(), mipLevelCount));
+ return provider->createMipMappedTexture(desc, SkBudgeted::kYes, texels.get(), mipLevelCount);
}
// Exercise GrSurface::gpuMemorySize for different combos of MSAA, RT-only,
@@ -1564,42 +1563,49 @@
static const int kSize = 64;
- sk_sp<GrTexture> tex;
-
// Normal versions
- tex = make_normal_texture(provider, kRenderTarget_GrSurfaceFlag, kSize, kSize, 0);
- size_t size = tex->gpuMemorySize();
- REPORTER_ASSERT(reporter, kSize*kSize*4 == size);
+ {
+ sk_sp<GrTexture> tex;
- if (context->caps()->maxSampleCount() >= 4) {
- tex = make_normal_texture(provider, kRenderTarget_GrSurfaceFlag, kSize, kSize, 4);
+ tex = make_normal_texture(provider, kRenderTarget_GrSurfaceFlag, kSize, kSize, 0);
+ size_t size = tex->gpuMemorySize();
+ REPORTER_ASSERT(reporter, kSize*kSize*4 == size);
+
+ if (context->caps()->maxSampleCount() >= 4) {
+ tex = make_normal_texture(provider, kRenderTarget_GrSurfaceFlag, kSize, kSize, 4);
+ size = tex->gpuMemorySize();
+ REPORTER_ASSERT(reporter, kSize*kSize*4 == size || // msaa4 failed
+ kSize*kSize*4*4 == size || // auto-resolving
+ kSize*kSize*4*5 == size); // explicit resolve buffer
+ }
+
+ tex = make_normal_texture(provider, kNone_GrSurfaceFlags, kSize, kSize, 0);
size = tex->gpuMemorySize();
- REPORTER_ASSERT(reporter, kSize*kSize*4 == size || // msaa4 failed
- kSize*kSize*4*4 == size || // auto-resolving
- kSize*kSize*4*5 == size); // explicit resolve buffer
+ REPORTER_ASSERT(reporter, kSize*kSize*4 == size);
}
- tex = make_normal_texture(provider, kNone_GrSurfaceFlags, kSize, kSize, 0);
- size = tex->gpuMemorySize();
- REPORTER_ASSERT(reporter, kSize*kSize*4 == size);
// Mipmapped versions
- tex = make_mipmap_texture(provider, kRenderTarget_GrSurfaceFlag, kSize, kSize, 0);
- size = tex->gpuMemorySize();
- REPORTER_ASSERT(reporter, kSize*kSize*4+(kSize*kSize*4)/3 == size);
+ {
+ sk_sp<GrTextureProxy> proxy;
- if (context->caps()->maxSampleCount() >= 4) {
- tex = make_mipmap_texture(provider, kRenderTarget_GrSurfaceFlag, kSize, kSize, 4);
- size = tex->gpuMemorySize();
- REPORTER_ASSERT(reporter,
+ proxy = make_mipmap_proxy(provider, kRenderTarget_GrSurfaceFlag, kSize, kSize, 0);
+ size_t size = proxy->gpuMemorySize();
+ REPORTER_ASSERT(reporter, kSize*kSize*4+(kSize*kSize*4)/3 == size);
+
+ if (context->caps()->maxSampleCount() >= 4) {
+ proxy = make_mipmap_proxy(provider, kRenderTarget_GrSurfaceFlag, kSize, kSize, 4);
+ size = proxy->gpuMemorySize();
+ REPORTER_ASSERT(reporter,
kSize*kSize*4+(kSize*kSize*4)/3 == size || // msaa4 failed
kSize*kSize*4*4+(kSize*kSize*4)/3 == size || // auto-resolving
kSize*kSize*4*5+(kSize*kSize*4)/3 == size); // explicit resolve buffer
- }
+ }
- tex = make_mipmap_texture(provider, kNone_GrSurfaceFlags, kSize, kSize, 0);
- size = tex->gpuMemorySize();
- REPORTER_ASSERT(reporter, kSize*kSize*4+(kSize*kSize*4)/3 == size);
+ proxy = make_mipmap_proxy(provider, kNone_GrSurfaceFlags, kSize, kSize, 0);
+ size = proxy->gpuMemorySize();
+ REPORTER_ASSERT(reporter, kSize*kSize*4+(kSize*kSize*4)/3 == size);
+ }
}
#endif
diff --git a/tests/SRGBReadWritePixelsTest.cpp b/tests/SRGBReadWritePixelsTest.cpp
index 9729774..e3087e6 100644
--- a/tests/SRGBReadWritePixelsTest.cpp
+++ b/tests/SRGBReadWritePixelsTest.cpp
@@ -169,6 +169,7 @@
kPremul_SkAlphaType);
GrSurfaceDesc desc;
desc.fFlags = kRenderTarget_GrSurfaceFlag;
+ desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
desc.fWidth = kW;
desc.fHeight = kH;
desc.fConfig = kSRGBA_8888_GrPixelConfig;
diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp
index d034961..aca7509 100644
--- a/tests/TestUtils.cpp
+++ b/tests/TestUtils.cpp
@@ -80,6 +80,8 @@
}
copyDstDesc.fFlags = flags;
+ copyDstDesc.fOrigin = (kNone_GrSurfaceFlags == flags) ? kTopLeft_GrSurfaceOrigin
+ : kBottomLeft_GrSurfaceOrigin;
sk_sp<GrSurfaceContext> dstContext(GrSurfaceProxy::TestCopy(context, copyDstDesc, proxy));
@@ -106,6 +108,8 @@
for (auto flags : { kNone_GrSurfaceFlags, kRenderTarget_GrSurfaceFlag }) {
copySrcDesc.fFlags = flags;
+ copySrcDesc.fOrigin = (kNone_GrSurfaceFlags == flags) ? kTopLeft_GrSurfaceOrigin
+ : kBottomLeft_GrSurfaceOrigin;
sk_sp<GrTextureProxy> src(GrSurfaceProxy::MakeDeferred(resourceProvider,
copySrcDesc,
diff --git a/tests/VkUploadPixelsTests.cpp b/tests/VkUploadPixelsTests.cpp
index 8b6a56b..50fc84f 100644
--- a/tests/VkUploadPixelsTests.cpp
+++ b/tests/VkUploadPixelsTests.cpp
@@ -12,6 +12,7 @@
#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS && defined(SK_VULKAN)
#include "GrContextFactory.h"
+#include "GrContextPriv.h"
#include "GrTest.h"
#include "Test.h"
#include "vk/GrVkGpu.h"
@@ -82,51 +83,60 @@
surfDesc.fHeight = kHeight;
surfDesc.fConfig = config;
surfDesc.fSampleCnt = 0;
- GrTexture* tex0 = gpu->createTexture(surfDesc, SkBudgeted::kNo, srcBuffer, 0);
+ sk_sp<GrTexture> tex0(gpu->createTexture(surfDesc, SkBudgeted::kNo, srcBuffer, 0));
if (tex0) {
REPORTER_ASSERT(reporter, canCreate);
- gpu->readPixels(tex0, 0, 0, kWidth, kHeight, config, dstBuffer, 0);
+ gpu->readPixels(tex0.get(), 0, 0, kWidth, kHeight, config, dstBuffer, 0);
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
dstBuffer,
config,
kWidth,
kHeight));
- tex0->writePixels(2, 10, 10, 2, config, srcBuffer);
+ sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeWrapped(tex0);
+
+ bool success = context->contextPriv().writeSurfacePixels(proxy.get(), nullptr,
+ 2, 10, 10, 2,
+ config, nullptr, srcBuffer, 0);
+ REPORTER_ASSERT(reporter, success);
+
memset(dstBuffer, 0, kWidth*kHeight*sizeof(GrColor));
- gpu->readPixels(tex0, 2, 10, 10, 2, config, dstBuffer, 0);
+ gpu->readPixels(tex0.get(), 2, 10, 10, 2, config, dstBuffer, 0);
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
dstBuffer,
config,
10,
2));
-
- tex0->unref();
} else {
REPORTER_ASSERT(reporter, !canCreate);
}
surfDesc.fOrigin = kBottomLeft_GrSurfaceOrigin;
- GrTexture* tex1 = gpu->createTexture(surfDesc, SkBudgeted::kNo, srcBuffer, 0);
+ sk_sp<GrTexture> tex1(gpu->createTexture(surfDesc, SkBudgeted::kNo, srcBuffer, 0));
if (tex1) {
REPORTER_ASSERT(reporter, canCreate);
- gpu->readPixels(tex1, 0, 0, kWidth, kHeight, config, dstBuffer, 0);
+ gpu->readPixels(tex1.get(), 0, 0, kWidth, kHeight, config, dstBuffer, 0);
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
dstBuffer,
config,
kWidth,
kHeight));
- tex1->writePixels(5, 4, 4, 5, config, srcBuffer);
+ sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeWrapped(tex1);
+
+ bool success = context->contextPriv().writeSurfacePixels(proxy.get(), nullptr,
+ 5, 4, 4, 5, config, nullptr,
+ srcBuffer, 0);
+ REPORTER_ASSERT(reporter, success);
+
memset(dstBuffer, 0, kWidth*kHeight*sizeof(GrColor));
- gpu->readPixels(tex1, 5, 4, 4, 5, config, dstBuffer, 0);
+ gpu->readPixels(tex1.get(), 5, 4, 4, 5, config, dstBuffer, 0);
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
dstBuffer,
config,
4,
5));
- tex1->unref();
} else {
REPORTER_ASSERT(reporter, !canCreate);
}