Migrate SkImage::MakeFromTexture to GrRecordingContext
Android migration landed in Android CL 12234077
Chrome migration is landing in Chrome CL 2335812
Note: makeFromCompressedTexture is not used by Chrome.
Bug: skia:104662
Change-Id: Ibbe6d412cf22e87188926383d10b21f780208e48
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305102
Commit-Queue: Adlai Holler <adlai@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Auto-Submit: Adlai Holler <adlai@google.com>
diff --git a/docs/examples/Image_MakeBackendTextureFromSkImage.cpp b/docs/examples/Image_MakeBackendTextureFromSkImage.cpp
index aabdaaf..450c1b4 100644
--- a/docs/examples/Image_MakeBackendTextureFromSkImage.cpp
+++ b/docs/examples/Image_MakeBackendTextureFromSkImage.cpp
@@ -3,9 +3,9 @@
#include "tools/fiddle/examples.h"
// HASH=06aeb3cf63ffccf7b49fe556e5def351
REG_FIDDLE(Image_MakeBackendTextureFromSkImage, 256, 64, false, 0) {
-static sk_sp<SkImage> create_gpu_image(GrContext* grContext) {
+static sk_sp<SkImage> create_gpu_image(GrRecordingContext* rContext) {
const SkImageInfo info = SkImageInfo::MakeN32(20, 20, kOpaque_SkAlphaType);
- auto surface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info));
+ auto surface(SkSurface::MakeRenderTarget(rContext, SkBudgeted::kNo, info));
SkCanvas* canvas = surface->getCanvas();
canvas->clear(SK_ColorWHITE);
SkPaint paint;
@@ -15,19 +15,19 @@
}
void draw(SkCanvas* canvas) {
- GrContext* grContext = canvas->getGrContext();
- if (!grContext) {
+ auto dContext = GrAsDirectContext(canvas->recordingContext());
+ if (!dContext) {
return;
}
- sk_sp<SkImage> backEndImage = create_gpu_image(grContext);
+ sk_sp<SkImage> backEndImage = create_gpu_image(dContext);
canvas->drawImage(backEndImage, 0, 0);
GrBackendTexture texture;
SkImage::BackendTextureReleaseProc proc;
- if (!SkImage::MakeBackendTextureFromSkImage(grContext, std::move(backEndImage),
+ if (!SkImage::MakeBackendTextureFromSkImage(dContext, std::move(backEndImage),
&texture, &proc)) {
return;
}
- sk_sp<SkImage> i2 = SkImage::MakeFromTexture(grContext, texture, kTopLeft_GrSurfaceOrigin,
+ sk_sp<SkImage> i2 = SkImage::MakeFromTexture(dContext, texture, kTopLeft_GrSurfaceOrigin,
kN32_SkColorType, kOpaque_SkAlphaType, nullptr);
canvas->drawImage(i2, 30, 30);
}
diff --git a/docs/examples/Image_MakeFromTexture.cpp b/docs/examples/Image_MakeFromTexture.cpp
index ea7c1c1..34f5583 100644
--- a/docs/examples/Image_MakeFromTexture.cpp
+++ b/docs/examples/Image_MakeFromTexture.cpp
@@ -4,14 +4,14 @@
// HASH=94e9296c53bad074bf2a48ff885dac13
REG_FIDDLE(Image_MakeFromTexture, 256, 128, false, 3) {
void draw(SkCanvas* canvas) {
- GrContext* context = canvas->getGrContext();
- if (!context) {
+ auto dContext = GrAsDirectContext(canvas->recordingContext());
+ if (!dContext) {
return;
}
canvas->scale(.25f, .25f);
int x = 0;
for (auto origin : { kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin } ) {
- sk_sp<SkImage> image = SkImage::MakeFromTexture(context, backEndTexture,
+ sk_sp<SkImage> image = SkImage::MakeFromTexture(dContext, backEndTexture,
origin, kRGBA_8888_SkColorType, kOpaque_SkAlphaType, nullptr);
canvas->drawImage(image, x, 0);
x += 512;
diff --git a/docs/examples/Image_MakeFromTexture_2.cpp b/docs/examples/Image_MakeFromTexture_2.cpp
index 46f684b..06ae193 100644
--- a/docs/examples/Image_MakeFromTexture_2.cpp
+++ b/docs/examples/Image_MakeFromTexture_2.cpp
@@ -4,8 +4,8 @@
// HASH=2b1e46354d823dbb53fa6af570135329
REG_FIDDLE(Image_MakeFromTexture_2, 256, 256, false, 4) {
void draw(SkCanvas* canvas) {
- GrContext* context = canvas->getGrContext();
- if (!context) {
+ auto dContext = GrAsDirectContext(canvas->recordingContext());
+ if (!dContext) {
return;
}
auto debugster = [](SkImage::ReleaseContext releaseContext) -> void {
@@ -13,7 +13,7 @@
};
int x = 0, y = 0;
for (auto origin : { kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin } ) {
- sk_sp<SkImage> image = SkImage::MakeFromTexture(context, backEndTexture,
+ sk_sp<SkImage> image = SkImage::MakeFromTexture(dContext, backEndTexture,
origin, kRGBA_8888_SkColorType, kOpaque_SkAlphaType, nullptr, debugster, &x);
canvas->drawImage(image, x, y);
y += 128;
diff --git a/docs/examples/Image_isValid.cpp b/docs/examples/Image_isValid.cpp
index ae30b2a..1fde4c3 100644
--- a/docs/examples/Image_isValid.cpp
+++ b/docs/examples/Image_isValid.cpp
@@ -4,6 +4,10 @@
// HASH=afc62f38aebc56af8e425297ec67dd37
REG_FIDDLE(Image_isValid, 256, 256, false, 5) {
void draw(SkCanvas* canvas) {
+ auto dContext = GrAsDirectContext(canvas->recordingContext());
+ if (!dContext) {
+ return;
+ }
auto drawImage = [=](sk_sp<SkImage> image, const char* label) -> void {
if (nullptr == image) {
return;
@@ -13,20 +17,19 @@
paint.setAntiAlias(true);
canvas->drawImage(image, 0, 0);
canvas->drawString(label, image->width() / 2, image->height() / 4, font, paint);
- if (canvas->recordingContext()) {
- const char* msg = image->isValid(canvas->recordingContext()) ? "is valid on GPU"
- : "not valid on GPU";
+ if (dContext) {
+ const char* msg = image->isValid(dContext) ? "is valid on GPU"
+ : "not valid on GPU";
canvas->drawString(msg, 20, image->height() * 5 / 8, font, paint);
}
- // CONTEXT TODO: Once GrContext is gone, remove this cast
- const char* msg = image->isValid((GrRecordingContext*) nullptr) ? "is valid on CPU"
- : "not valid on CPU";
+ const char* msg = image->isValid(nullptr) ? "is valid on CPU"
+ : "not valid on CPU";
canvas->drawString(msg, 20, image->height() * 7 / 8, font, paint);
};
sk_sp<SkImage> bitmapImage(SkImage::MakeFromBitmap(source));
- sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(canvas->getGrContext(), backEndTexture,
+ sk_sp<SkImage> textureImage(SkImage::MakeFromTexture(dContext, backEndTexture,
kTopLeft_GrSurfaceOrigin, kRGBA_8888_SkColorType,
kOpaque_SkAlphaType, nullptr));
drawImage(image, "image");