Migrate texture creation methods to GrDirectContext
Cut and paste job. Getting close!
Change-Id: Ifd1673a92a44dac1e8aab578a3e41b2a2b5e3325
Cq-Include-Trybots: luci.skia.skia.primary:Perf-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-CanvasKit,Perf-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-Puppeteer_RenderSKP
Change-Id: Ifd1673a92a44dac1e8aab578a3e41b2a2b5e3325
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325659
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Auto-Submit: Adlai Holler <adlai@google.com>
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 575adf9..1d28619 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -39,188 +39,10 @@
#include <atomic>
#include <memory>
-#define ASSERT_OWNED_PROXY(P) \
- SkASSERT(!(P) || !((P)->peekTexture()) || (P)->peekTexture()->getContext() == this)
-
-#define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this)
-#define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(this->singleOwner())
-#define RETURN_IF_ABANDONED if (this->abandoned()) { return; }
-#define RETURN_FALSE_IF_ABANDONED if (this->abandoned()) { return false; }
-#define RETURN_NULL_IF_ABANDONED if (this->abandoned()) { return nullptr; }
-
GrContext::GrContext(sk_sp<GrContextThreadSafeProxy> proxy) : INHERITED(std::move(proxy)) { }
GrContext::~GrContext() = default;
-GrBackendTexture GrContext::createBackendTexture(int width, int height,
- const GrBackendFormat& backendFormat,
- GrMipmapped mipMapped,
- GrRenderable renderable,
- GrProtected isProtected) {
- TRACE_EVENT0("skia.gpu", TRACE_FUNC);
- if (!this->asDirectContext()) {
- return GrBackendTexture();
- }
-
- if (this->abandoned()) {
- return GrBackendTexture();
- }
-
- return fGpu->createBackendTexture({width, height}, backendFormat, renderable,
- mipMapped, isProtected);
-}
-
-GrBackendTexture GrContext::createBackendTexture(int width, int height,
- SkColorType skColorType,
- GrMipmapped mipMapped,
- GrRenderable renderable,
- GrProtected isProtected) {
- if (!this->asDirectContext()) {
- return GrBackendTexture();
- }
-
- if (this->abandoned()) {
- return GrBackendTexture();
- }
-
- const GrBackendFormat format = this->defaultBackendFormat(skColorType, renderable);
-
- return this->createBackendTexture(width, height, format, mipMapped, renderable, isProtected);
-}
-
-static GrBackendTexture create_and_update_backend_texture(
- GrDirectContext* context,
- SkISize dimensions,
- const GrBackendFormat& backendFormat,
- GrMipmapped mipMapped,
- GrRenderable renderable,
- GrProtected isProtected,
- sk_sp<GrRefCntedCallback> finishedCallback,
- const GrGpu::BackendTextureData* data) {
- GrGpu* gpu = context->priv().getGpu();
-
- GrBackendTexture beTex = gpu->createBackendTexture(dimensions, backendFormat, renderable,
- mipMapped, isProtected);
- if (!beTex.isValid()) {
- return {};
- }
-
- if (!context->priv().getGpu()->updateBackendTexture(beTex, std::move(finishedCallback), data)) {
- context->deleteBackendTexture(beTex);
- return {};
- }
- return beTex;
-}
-
-GrBackendTexture GrContext::createBackendTexture(int width, int height,
- const GrBackendFormat& backendFormat,
- const SkColor4f& color,
- GrMipmapped mipMapped,
- GrRenderable renderable,
- GrProtected isProtected,
- GrGpuFinishedProc finishedProc,
- GrGpuFinishedContext finishedContext) {
- sk_sp<GrRefCntedCallback> finishedCallback;
- if (finishedProc) {
- finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
- }
-
- TRACE_EVENT0("skia.gpu", TRACE_FUNC);
- if (!this->asDirectContext()) {
- return {};
- }
-
- if (this->abandoned()) {
- return {};
- }
-
- GrGpu::BackendTextureData data(color);
- return create_and_update_backend_texture(this->asDirectContext(), {width, height},
- backendFormat, mipMapped, renderable, isProtected,
- std::move(finishedCallback), &data);
-}
-
-GrBackendTexture GrContext::createBackendTexture(int width, int height,
- SkColorType skColorType,
- const SkColor4f& color,
- GrMipmapped mipMapped,
- GrRenderable renderable,
- GrProtected isProtected,
- GrGpuFinishedProc finishedProc,
- GrGpuFinishedContext finishedContext) {
- sk_sp<GrRefCntedCallback> finishedCallback;
- if (finishedProc) {
- finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
- }
-
- if (!this->asDirectContext()) {
- return {};
- }
-
- if (this->abandoned()) {
- return {};
- }
-
- GrBackendFormat format = this->defaultBackendFormat(skColorType, renderable);
- if (!format.isValid()) {
- return {};
- }
-
- GrColorType grColorType = SkColorTypeToGrColorType(skColorType);
- SkColor4f swizzledColor = this->caps()->getWriteSwizzle(format, grColorType).applyTo(color);
-
- GrGpu::BackendTextureData data(swizzledColor);
- return create_and_update_backend_texture(this->asDirectContext(), {width, height}, format,
- mipMapped, renderable, isProtected,
- std::move(finishedCallback), &data);
-}
-
-GrBackendTexture GrContext::createBackendTexture(const SkPixmap srcData[], int numProvidedLevels,
- GrRenderable renderable, GrProtected isProtected,
- GrGpuFinishedProc finishedProc,
- GrGpuFinishedContext finishedContext) {
- TRACE_EVENT0("skia.gpu", TRACE_FUNC);
-
- sk_sp<GrRefCntedCallback> finishedCallback;
- if (finishedProc) {
- finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
- }
-
- if (!this->asDirectContext()) {
- return {};
- }
-
- if (this->abandoned()) {
- return {};
- }
-
- if (!srcData || numProvidedLevels <= 0) {
- return {};
- }
-
- int baseWidth = srcData[0].width();
- int baseHeight = srcData[0].height();
- SkColorType colorType = srcData[0].colorType();
-
- GrMipmapped mipMapped = GrMipmapped::kNo;
- int numExpectedLevels = 1;
- if (numProvidedLevels > 1) {
- numExpectedLevels = SkMipmap::ComputeLevelCount(baseWidth, baseHeight) + 1;
- mipMapped = GrMipmapped::kYes;
- }
-
- if (numProvidedLevels != numExpectedLevels) {
- return {};
- }
-
- GrBackendFormat backendFormat = this->defaultBackendFormat(colorType, renderable);
-
- GrGpu::BackendTextureData data(srcData);
- return create_and_update_backend_texture(this->asDirectContext(), {baseWidth, baseHeight},
- backendFormat, mipMapped, renderable, isProtected,
- std::move(finishedCallback), &data);
-}
-
bool GrContext::updateBackendTexture(const GrBackendTexture& backendTexture,
const SkColor4f& color,
GrGpuFinishedProc finishedProc,
diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp
index 78fa9ab..ac5722a 100644
--- a/src/gpu/GrDirectContext.cpp
+++ b/src/gpu/GrDirectContext.cpp
@@ -449,6 +449,159 @@
colorSamplesPerPixel, mipMapped, useNextPow2);
}
+GrBackendTexture GrDirectContext::createBackendTexture(int width, int height,
+ const GrBackendFormat& backendFormat,
+ GrMipmapped mipMapped,
+ GrRenderable renderable,
+ GrProtected isProtected) {
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
+ if (this->abandoned()) {
+ return GrBackendTexture();
+ }
+
+ return fGpu->createBackendTexture({width, height}, backendFormat, renderable,
+ mipMapped, isProtected);
+}
+
+GrBackendTexture GrDirectContext::createBackendTexture(int width, int height,
+ SkColorType skColorType,
+ GrMipmapped mipMapped,
+ GrRenderable renderable,
+ GrProtected isProtected) {
+ if (this->abandoned()) {
+ return GrBackendTexture();
+ }
+
+ const GrBackendFormat format = this->defaultBackendFormat(skColorType, renderable);
+
+ return this->createBackendTexture(width, height, format, mipMapped, renderable, isProtected);
+}
+
+static GrBackendTexture create_and_update_backend_texture(
+ GrDirectContext* dContext,
+ SkISize dimensions,
+ const GrBackendFormat& backendFormat,
+ GrMipmapped mipMapped,
+ GrRenderable renderable,
+ GrProtected isProtected,
+ sk_sp<GrRefCntedCallback> finishedCallback,
+ const GrGpu::BackendTextureData* data) {
+ GrGpu* gpu = dContext->priv().getGpu();
+
+ GrBackendTexture beTex = gpu->createBackendTexture(dimensions, backendFormat, renderable,
+ mipMapped, isProtected);
+ if (!beTex.isValid()) {
+ return {};
+ }
+
+ if (!dContext->priv().getGpu()->updateBackendTexture(beTex,
+ std::move(finishedCallback),
+ data)) {
+ dContext->deleteBackendTexture(beTex);
+ return {};
+ }
+ return beTex;
+}
+
+GrBackendTexture GrDirectContext::createBackendTexture(int width, int height,
+ const GrBackendFormat& backendFormat,
+ const SkColor4f& color,
+ GrMipmapped mipMapped,
+ GrRenderable renderable,
+ GrProtected isProtected,
+ GrGpuFinishedProc finishedProc,
+ GrGpuFinishedContext finishedContext) {
+ sk_sp<GrRefCntedCallback> finishedCallback;
+ if (finishedProc) {
+ finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+ }
+
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
+ if (this->abandoned()) {
+ return {};
+ }
+
+ GrGpu::BackendTextureData data(color);
+ return create_and_update_backend_texture(this, {width, height},
+ backendFormat, mipMapped, renderable, isProtected,
+ std::move(finishedCallback), &data);
+}
+
+GrBackendTexture GrDirectContext::createBackendTexture(int width, int height,
+ SkColorType skColorType,
+ const SkColor4f& color,
+ GrMipmapped mipMapped,
+ GrRenderable renderable,
+ GrProtected isProtected,
+ GrGpuFinishedProc finishedProc,
+ GrGpuFinishedContext finishedContext) {
+ sk_sp<GrRefCntedCallback> finishedCallback;
+ if (finishedProc) {
+ finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+ }
+
+ if (this->abandoned()) {
+ return {};
+ }
+
+ GrBackendFormat format = this->defaultBackendFormat(skColorType, renderable);
+ if (!format.isValid()) {
+ return {};
+ }
+
+ GrColorType grColorType = SkColorTypeToGrColorType(skColorType);
+ SkColor4f swizzledColor = this->caps()->getWriteSwizzle(format, grColorType).applyTo(color);
+
+ GrGpu::BackendTextureData data(swizzledColor);
+ return create_and_update_backend_texture(this, {width, height}, format,
+ mipMapped, renderable, isProtected,
+ std::move(finishedCallback), &data);
+}
+
+GrBackendTexture GrDirectContext::createBackendTexture(const SkPixmap srcData[],
+ int numProvidedLevels,
+ GrRenderable renderable,
+ GrProtected isProtected,
+ GrGpuFinishedProc finishedProc,
+ GrGpuFinishedContext finishedContext) {
+ TRACE_EVENT0("skia.gpu", TRACE_FUNC);
+
+ sk_sp<GrRefCntedCallback> finishedCallback;
+ if (finishedProc) {
+ finishedCallback.reset(new GrRefCntedCallback(finishedProc, finishedContext));
+ }
+
+ if (this->abandoned()) {
+ return {};
+ }
+
+ if (!srcData || numProvidedLevels <= 0) {
+ return {};
+ }
+
+ int baseWidth = srcData[0].width();
+ int baseHeight = srcData[0].height();
+ SkColorType colorType = srcData[0].colorType();
+
+ GrMipmapped mipMapped = GrMipmapped::kNo;
+ int numExpectedLevels = 1;
+ if (numProvidedLevels > 1) {
+ numExpectedLevels = SkMipmap::ComputeLevelCount(baseWidth, baseHeight) + 1;
+ mipMapped = GrMipmapped::kYes;
+ }
+
+ if (numProvidedLevels != numExpectedLevels) {
+ return {};
+ }
+
+ GrBackendFormat backendFormat = this->defaultBackendFormat(colorType, renderable);
+
+ GrGpu::BackendTextureData data(srcData);
+ return create_and_update_backend_texture(this, {baseWidth, baseHeight},
+ backendFormat, mipMapped, renderable, isProtected,
+ std::move(finishedCallback), &data);
+}
+
#ifdef SK_GL
/*************************************************************************************************/