AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Android Framework specific logging to SkSurface::MakeFromBackendTexture

Browse Source 
This is an attempt to get more diagnostic information when an SkSurface fails
to be created.

Bug: b/206415266
Change-Id: I536417e1a6d1f0f99e5e9e41e2fee43f7aa9b464
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/484338
Reviewed-by: Leon Scroggins <scroggo@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>
This commit is contained in:
Derek Sollenberger 2021-12-14 10:24:19 -05:00 committed by SkCQ
parent 16d3cc04cc
commit 04a9672c0a
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/image/SkSurface_Gpu.cpp
View File

@ -425,6 +425,12 @@ sk_sp<SkSurface> SkSurface::MakeRenderTarget(GrRecordingContext* rContext,
return result;
}
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
#define ANDROIDFRAMEWORK_DEBUGF(...) SkDebugf(__VA_ARGS__)
#else
#define ANDROIDFRAMEWORK_DEBUGF(...)
#endif
static bool validate_backend_texture(const GrCaps* caps, const GrBackendTexture& tex,
int sampleCnt, GrColorType grCT,
bool texturable) {
@ -434,18 +440,29 @@ static bool validate_backend_texture(const GrCaps* caps, const GrBackendTexture&
GrBackendFormat backendFormat = tex.getBackendFormat();
if (!backendFormat.isValid()) {
ANDROIDFRAMEWORK_DEBUGF("%s failed due to an invalid format", __func__);
return false;
}
if (!caps->areColorTypeAndFormatCompatible(grCT, backendFormat)) {
ANDROIDFRAMEWORK_DEBUGF("%s failed due to an invalid format and colorType combination",
__func__);
return false;
}
if (!caps->isFormatAsColorTypeRenderable(grCT, backendFormat, sampleCnt)) {
ANDROIDFRAMEWORK_DEBUGF(
"%s failed due to no supported rendering path for the selected "
"format and colorType",
__func__);
return false;
}
if (texturable && !caps->isFormatTexturable(backendFormat, tex.textureType())) {
ANDROIDFRAMEWORK_DEBUGF(
"%s failed due to no texturing support for the selected format and "
"colorType",
__func__);
return false;
}
@ -488,12 +505,15 @@ sk_sp<SkSurface> SkSurface::MakeFromBackendTexture(GrRecordingContext* rContext,
auto releaseHelper = GrRefCntedCallback::Make(textureReleaseProc, releaseContext);
if (!rContext) {
ANDROIDFRAMEWORK_DEBUGF("%s failed due to a null context ", __func__);
return nullptr;
}
sampleCnt = std::max(1, sampleCnt);
GrColorType grColorType = SkColorTypeToGrColorType(colorType);
if (grColorType == GrColorType::kUnknown) {
ANDROIDFRAMEWORK_DEBUGF(
"%s failed due to an unsupported colorType %d", __func__, colorType);
return nullptr;
}
@ -505,6 +525,8 @@ sk_sp<SkSurface> SkSurface::MakeFromBackendTexture(GrRecordingContext* rContext,
tex, sampleCnt, kBorrow_GrWrapOwnership, GrWrapCacheable::kNo,
std::move(releaseHelper)));
if (!proxy) {
ANDROIDFRAMEWORK_DEBUGF("%s failed to wrap the texture into a renderable target ",
__func__);
return nullptr;
}
@ -513,6 +535,7 @@ sk_sp<SkSurface> SkSurface::MakeFromBackendTexture(GrRecordingContext* rContext,
SkSurfacePropsCopyOrDefault(props),
skgpu::BaseDevice::InitContents::kUninit);
if (!device) {
ANDROIDFRAMEWORK_DEBUGF("%s failed to wrap the renderTarget into a surface", __func__);
return nullptr;
}