2018-05-29 20:13:26 +00:00
|
|
|
/*
|
|
|
|
* Copyright 2018 Google Inc.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
|
|
* found in the LICENSE file.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "DDLPromiseImageHelper.h"
|
|
|
|
|
|
|
|
#include "GrContext.h"
|
|
|
|
#include "GrContextPriv.h"
|
|
|
|
#include "GrGpu.h"
|
2018-09-27 18:26:47 +00:00
|
|
|
#include "SkCachedData.h"
|
2018-05-29 20:13:26 +00:00
|
|
|
#include "SkDeferredDisplayListRecorder.h"
|
2018-09-27 18:26:47 +00:00
|
|
|
#include "SkImage_Base.h"
|
2018-10-04 13:10:29 +00:00
|
|
|
#include "SkYUVAIndex.h"
|
2018-10-29 20:26:02 +00:00
|
|
|
#include "SkYUVASizeInfo.h"
|
2018-05-29 20:13:26 +00:00
|
|
|
|
|
|
|
DDLPromiseImageHelper::PromiseImageCallbackContext::~PromiseImageCallbackContext() {
|
2019-01-10 17:09:52 +00:00
|
|
|
SkASSERT(fDoneCnt == fNumImages);
|
|
|
|
SkASSERT(!fUnreleasedFulfills);
|
|
|
|
SkASSERT(fTotalReleases == fTotalFulfills);
|
|
|
|
SkASSERT(!fTotalFulfills || fDoneCnt);
|
2018-05-29 20:13:26 +00:00
|
|
|
|
2019-01-11 21:03:19 +00:00
|
|
|
if (fPromiseImageTexture) {
|
|
|
|
GrGpu* gpu = fContext->contextPriv().getGpu();
|
|
|
|
gpu->deleteTestingOnlyBackendTexture(fPromiseImageTexture->backendTexture());
|
2018-05-29 20:13:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-10 17:09:52 +00:00
|
|
|
void DDLPromiseImageHelper::PromiseImageCallbackContext::setBackendTexture(
|
|
|
|
const GrBackendTexture& backendTexture) {
|
|
|
|
SkASSERT(!fUnreleasedFulfills);
|
2019-01-11 21:03:19 +00:00
|
|
|
if (fPromiseImageTexture) {
|
2019-01-10 17:09:52 +00:00
|
|
|
GrGpu* gpu = fContext->contextPriv().getGpu();
|
2019-01-11 21:03:19 +00:00
|
|
|
gpu->deleteTestingOnlyBackendTexture(fPromiseImageTexture->backendTexture());
|
2019-01-10 17:09:52 +00:00
|
|
|
}
|
2019-01-11 21:03:19 +00:00
|
|
|
fPromiseImageTexture = SkPromiseImageTexture::Make(backendTexture);
|
2019-01-10 17:09:52 +00:00
|
|
|
}
|
|
|
|
|
2018-05-29 20:13:26 +00:00
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2018-09-27 18:26:47 +00:00
|
|
|
DDLPromiseImageHelper::~DDLPromiseImageHelper() {}
|
|
|
|
|
2018-05-29 20:13:26 +00:00
|
|
|
sk_sp<SkData> DDLPromiseImageHelper::deflateSKP(const SkPicture* inputPicture) {
|
|
|
|
SkSerialProcs procs;
|
|
|
|
|
|
|
|
procs.fImageCtx = this;
|
|
|
|
procs.fImageProc = [](SkImage* image, void* ctx) -> sk_sp<SkData> {
|
|
|
|
auto helper = static_cast<DDLPromiseImageHelper*>(ctx);
|
|
|
|
|
|
|
|
int id = helper->findOrDefineImage(image);
|
|
|
|
if (id >= 0) {
|
|
|
|
SkASSERT(helper->isValidID(id));
|
|
|
|
return SkData::MakeWithCopy(&id, sizeof(id));
|
|
|
|
}
|
|
|
|
|
|
|
|
return nullptr;
|
|
|
|
};
|
|
|
|
|
|
|
|
return inputPicture->serialize(&procs);
|
|
|
|
}
|
|
|
|
|
2018-12-06 18:11:53 +00:00
|
|
|
// needed until we have SkRG_88_ColorType;
|
|
|
|
static GrBackendTexture create_yuva_texture(GrGpu* gpu, const SkPixmap& pm,
|
|
|
|
const SkYUVAIndex yuvaIndices[4], int texIndex) {
|
|
|
|
SkASSERT(texIndex >= 0 && texIndex <= 3);
|
|
|
|
int channelCount = 0;
|
|
|
|
for (int i = 0; i < SkYUVAIndex::kIndexCount; ++i) {
|
|
|
|
if (yuvaIndices[i].fIndex == texIndex) {
|
|
|
|
++channelCount;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Need to create an RG texture for two-channel planes
|
|
|
|
GrBackendTexture tex;
|
|
|
|
if (2 == channelCount) {
|
|
|
|
SkASSERT(kRGBA_8888_SkColorType == pm.colorType());
|
|
|
|
SkAutoTMalloc<char> pixels(2 * pm.width()*pm.height());
|
|
|
|
char* currPixel = pixels;
|
|
|
|
for (int y = 0; y < pm.height(); ++y) {
|
|
|
|
for (int x = 0; x < pm.width(); ++x) {
|
|
|
|
SkColor color = pm.getColor(x, y);
|
|
|
|
currPixel[0] = SkColorGetR(color);
|
|
|
|
currPixel[1] = SkColorGetG(color);
|
|
|
|
currPixel += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tex = gpu->createTestingOnlyBackendTexture(
|
|
|
|
pixels,
|
|
|
|
pm.width(),
|
|
|
|
pm.height(),
|
|
|
|
GrColorType::kRG_88,
|
|
|
|
false,
|
|
|
|
GrMipMapped::kNo,
|
|
|
|
2 * pm.width());
|
|
|
|
} else {
|
|
|
|
tex = gpu->createTestingOnlyBackendTexture(
|
|
|
|
pm.addr(),
|
|
|
|
pm.width(),
|
|
|
|
pm.height(),
|
|
|
|
pm.colorType(),
|
|
|
|
false,
|
|
|
|
GrMipMapped::kNo,
|
|
|
|
pm.rowBytes());
|
|
|
|
}
|
|
|
|
return tex;
|
|
|
|
}
|
|
|
|
|
2018-05-29 20:13:26 +00:00
|
|
|
void DDLPromiseImageHelper::uploadAllToGPU(GrContext* context) {
|
|
|
|
GrGpu* gpu = context->contextPriv().getGpu();
|
|
|
|
SkASSERT(gpu);
|
|
|
|
|
2019-01-10 16:33:06 +00:00
|
|
|
for (int i = 0; i < fImageInfo.count(); ++i) {
|
2018-05-29 20:13:26 +00:00
|
|
|
const PromiseImageInfo& info = fImageInfo[i];
|
|
|
|
|
|
|
|
// DDL TODO: how can we tell if we need mipmapping!
|
2018-09-27 18:26:47 +00:00
|
|
|
if (info.isYUV()) {
|
2018-10-18 18:36:59 +00:00
|
|
|
int numPixmaps;
|
|
|
|
SkAssertResult(SkYUVAIndex::AreValidIndices(info.yuvaIndices(), &numPixmaps));
|
|
|
|
for (int j = 0; j < numPixmaps; ++j) {
|
2018-09-27 18:26:47 +00:00
|
|
|
const SkPixmap& yuvPixmap = info.yuvPixmap(j);
|
|
|
|
|
|
|
|
sk_sp<PromiseImageCallbackContext> callbackContext(
|
|
|
|
new PromiseImageCallbackContext(context));
|
2018-12-06 18:11:53 +00:00
|
|
|
|
|
|
|
callbackContext->setBackendTexture(create_yuva_texture(gpu, yuvPixmap,
|
|
|
|
info.yuvaIndices(), j));
|
2019-01-11 21:03:19 +00:00
|
|
|
SkASSERT(callbackContext->promiseImageTexture());
|
2018-09-27 18:26:47 +00:00
|
|
|
|
|
|
|
fImageInfo[i].setCallbackContext(j, std::move(callbackContext));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
sk_sp<PromiseImageCallbackContext> callbackContext(
|
|
|
|
new PromiseImageCallbackContext(context));
|
|
|
|
|
|
|
|
const SkBitmap& bm = info.normalBitmap();
|
|
|
|
|
|
|
|
callbackContext->setBackendTexture(gpu->createTestingOnlyBackendTexture(
|
|
|
|
bm.getPixels(),
|
|
|
|
bm.width(),
|
|
|
|
bm.height(),
|
|
|
|
bm.colorType(),
|
|
|
|
false, GrMipMapped::kNo,
|
|
|
|
bm.rowBytes()));
|
|
|
|
// The GMs sometimes request too large an image
|
|
|
|
//SkAssertResult(callbackContext->backendTexture().isValid());
|
|
|
|
|
|
|
|
fImageInfo[i].setCallbackContext(0, std::move(callbackContext));
|
|
|
|
}
|
2019-01-10 17:09:52 +00:00
|
|
|
}
|
|
|
|
}
|
2018-09-27 18:26:47 +00:00
|
|
|
|
2019-01-10 17:09:52 +00:00
|
|
|
void DDLPromiseImageHelper::replaceEveryOtherPromiseTexture(GrContext* context) {
|
|
|
|
GrGpu* gpu = context->contextPriv().getGpu();
|
|
|
|
SkASSERT(gpu);
|
|
|
|
|
|
|
|
for (int i = 0; i < fImageInfo.count(); i += 2) {
|
|
|
|
PromiseImageInfo& info = fImageInfo[i];
|
|
|
|
|
|
|
|
// DDL TODO: how can we tell if we need mipmapping!
|
|
|
|
if (info.isYUV()) {
|
|
|
|
int numPixmaps;
|
|
|
|
SkAssertResult(SkYUVAIndex::AreValidIndices(info.yuvaIndices(), &numPixmaps));
|
|
|
|
for (int j = 0; j < numPixmaps; ++j) {
|
|
|
|
const SkPixmap& yuvPixmap = info.yuvPixmap(j);
|
|
|
|
info.callbackContext(j)->setBackendTexture(
|
|
|
|
create_yuva_texture(gpu, yuvPixmap, info.yuvaIndices(), j));
|
2019-01-11 21:03:19 +00:00
|
|
|
SkASSERT(info.callbackContext(j)->promiseImageTexture());
|
2019-01-10 17:09:52 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
const SkBitmap& bm = info.normalBitmap();
|
|
|
|
info.callbackContext(0)->setBackendTexture(gpu->createTestingOnlyBackendTexture(
|
|
|
|
bm.getPixels(), bm.width(), bm.height(), bm.colorType(), false,
|
|
|
|
GrMipMapped::kNo, bm.rowBytes()));
|
|
|
|
// The GMs sometimes request too large an image
|
|
|
|
// SkAssertResult(callbackContext->backendTexture().isValid());
|
|
|
|
}
|
2018-05-29 20:13:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sk_sp<SkPicture> DDLPromiseImageHelper::reinflateSKP(
|
|
|
|
SkDeferredDisplayListRecorder* recorder,
|
|
|
|
SkData* compressedPictureData,
|
|
|
|
SkTArray<sk_sp<SkImage>>* promiseImages) const {
|
|
|
|
PerRecorderContext perRecorderContext { recorder, this, promiseImages };
|
|
|
|
|
|
|
|
SkDeserialProcs procs;
|
|
|
|
procs.fImageCtx = (void*) &perRecorderContext;
|
|
|
|
procs.fImageProc = PromiseImageCreator;
|
|
|
|
|
|
|
|
return SkPicture::MakeFromData(compressedPictureData, &procs);
|
|
|
|
}
|
|
|
|
|
|
|
|
// This generates promise images to replace the indices in the compressed picture. This
|
|
|
|
// reconstitution is performed separately in each thread so we end up with multiple
|
|
|
|
// promise images referring to the same GrBackendTexture.
|
|
|
|
sk_sp<SkImage> DDLPromiseImageHelper::PromiseImageCreator(const void* rawData,
|
|
|
|
size_t length, void* ctxIn) {
|
|
|
|
PerRecorderContext* perRecorderContext = static_cast<PerRecorderContext*>(ctxIn);
|
|
|
|
const DDLPromiseImageHelper* helper = perRecorderContext->fHelper;
|
|
|
|
SkDeferredDisplayListRecorder* recorder = perRecorderContext->fRecorder;
|
|
|
|
|
|
|
|
SkASSERT(length == sizeof(int));
|
|
|
|
|
|
|
|
const int* indexPtr = static_cast<const int*>(rawData);
|
|
|
|
SkASSERT(helper->isValidID(*indexPtr));
|
|
|
|
|
|
|
|
const DDLPromiseImageHelper::PromiseImageInfo& curImage = helper->getInfo(*indexPtr);
|
|
|
|
|
2019-01-11 21:03:19 +00:00
|
|
|
if (!curImage.promiseTexture(0)) {
|
2018-09-27 18:26:47 +00:00
|
|
|
SkASSERT(!curImage.isYUV());
|
2018-05-29 20:13:26 +00:00
|
|
|
// We weren't able to make a backend texture for this SkImage. In this case we create
|
|
|
|
// a separate bitmap-backed image for each thread.
|
2018-09-27 18:26:47 +00:00
|
|
|
SkASSERT(curImage.normalBitmap().isImmutable());
|
|
|
|
return SkImage::MakeFromBitmap(curImage.normalBitmap());
|
|
|
|
}
|
|
|
|
SkASSERT(curImage.index() == *indexPtr);
|
|
|
|
|
|
|
|
sk_sp<SkImage> image;
|
|
|
|
if (curImage.isYUV()) {
|
2018-10-29 20:26:02 +00:00
|
|
|
GrBackendFormat backendFormats[SkYUVASizeInfo::kMaxCount];
|
|
|
|
void* contexts[SkYUVASizeInfo::kMaxCount] = { nullptr, nullptr, nullptr, nullptr };
|
|
|
|
SkISize sizes[SkYUVASizeInfo::kMaxCount];
|
2018-10-18 18:36:59 +00:00
|
|
|
// TODO: store this value somewhere?
|
|
|
|
int textureCount;
|
|
|
|
SkAssertResult(SkYUVAIndex::AreValidIndices(curImage.yuvaIndices(), &textureCount));
|
|
|
|
for (int i = 0; i < textureCount; ++i) {
|
2019-01-11 21:03:19 +00:00
|
|
|
const GrBackendTexture& backendTex = curImage.promiseTexture(i)->backendTexture();
|
2018-12-14 14:18:50 +00:00
|
|
|
backendFormats[i] = backendTex.getBackendFormat();
|
|
|
|
SkASSERT(backendFormats[i].isValid());
|
2018-09-27 18:26:47 +00:00
|
|
|
contexts[i] = curImage.refCallbackContext(i).release();
|
2018-10-24 14:32:20 +00:00
|
|
|
sizes[i].set(curImage.yuvPixmap(i).width(), curImage.yuvPixmap(i).height());
|
2018-10-18 18:36:59 +00:00
|
|
|
}
|
2018-10-29 20:26:02 +00:00
|
|
|
for (int i = textureCount; i < SkYUVASizeInfo::kMaxCount; ++i) {
|
2018-10-24 14:32:20 +00:00
|
|
|
sizes[i] = SkISize::MakeEmpty();
|
2018-09-27 18:26:47 +00:00
|
|
|
}
|
2018-10-18 16:13:18 +00:00
|
|
|
|
2018-09-27 18:26:47 +00:00
|
|
|
image = recorder->makeYUVAPromiseTexture(curImage.yuvColorSpace(),
|
|
|
|
backendFormats,
|
2018-10-24 14:32:20 +00:00
|
|
|
sizes,
|
2018-10-18 18:36:59 +00:00
|
|
|
curImage.yuvaIndices(),
|
2018-10-12 19:00:20 +00:00
|
|
|
curImage.overallWidth(),
|
|
|
|
curImage.overallHeight(),
|
2018-09-27 18:26:47 +00:00
|
|
|
GrSurfaceOrigin::kTopLeft_GrSurfaceOrigin,
|
|
|
|
curImage.refOverallColorSpace(),
|
|
|
|
DDLPromiseImageHelper::PromiseImageFulfillProc,
|
|
|
|
DDLPromiseImageHelper::PromiseImageReleaseProc,
|
|
|
|
DDLPromiseImageHelper::PromiseImageDoneProc,
|
|
|
|
contexts);
|
2019-01-10 17:09:52 +00:00
|
|
|
for (int i = 0; i < textureCount; ++i) {
|
|
|
|
curImage.callbackContext(i)->wasAddedToImage();
|
|
|
|
}
|
2018-09-27 18:26:47 +00:00
|
|
|
} else {
|
2019-01-11 21:03:19 +00:00
|
|
|
const GrBackendTexture& backendTex = curImage.promiseTexture(0)->backendTexture();
|
2018-12-14 14:18:50 +00:00
|
|
|
GrBackendFormat backendFormat = backendTex.getBackendFormat();
|
|
|
|
SkASSERT(backendFormat.isValid());
|
2018-09-27 18:26:47 +00:00
|
|
|
|
|
|
|
// Each DDL recorder gets its own ref on the promise callback context for the
|
|
|
|
// promise images it creates.
|
|
|
|
// DDL TODO: sort out mipmapping
|
|
|
|
image = recorder->makePromiseTexture(backendFormat,
|
|
|
|
curImage.overallWidth(),
|
|
|
|
curImage.overallHeight(),
|
|
|
|
GrMipMapped::kNo,
|
|
|
|
GrSurfaceOrigin::kTopLeft_GrSurfaceOrigin,
|
|
|
|
curImage.overallColorType(),
|
|
|
|
curImage.overallAlphaType(),
|
|
|
|
curImage.refOverallColorSpace(),
|
|
|
|
DDLPromiseImageHelper::PromiseImageFulfillProc,
|
|
|
|
DDLPromiseImageHelper::PromiseImageReleaseProc,
|
|
|
|
DDLPromiseImageHelper::PromiseImageDoneProc,
|
|
|
|
(void*) curImage.refCallbackContext(0).release());
|
2019-01-10 17:09:52 +00:00
|
|
|
curImage.callbackContext(0)->wasAddedToImage();
|
2018-05-29 20:13:26 +00:00
|
|
|
}
|
|
|
|
perRecorderContext->fPromiseImages->push_back(image);
|
|
|
|
SkASSERT(image);
|
|
|
|
return image;
|
|
|
|
}
|
|
|
|
|
|
|
|
int DDLPromiseImageHelper::findImage(SkImage* image) const {
|
|
|
|
for (int i = 0; i < fImageInfo.count(); ++i) {
|
2018-09-27 18:26:47 +00:00
|
|
|
if (fImageInfo[i].originalUniqueID() == image->uniqueID()) { // trying to dedup here
|
|
|
|
SkASSERT(fImageInfo[i].index() == i);
|
|
|
|
SkASSERT(this->isValidID(i) && this->isValidID(fImageInfo[i].index()));
|
2018-05-29 20:13:26 +00:00
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int DDLPromiseImageHelper::addImage(SkImage* image) {
|
2018-09-27 18:26:47 +00:00
|
|
|
SkImage_Base* ib = as_IB(image);
|
|
|
|
|
|
|
|
SkImageInfo overallII = SkImageInfo::Make(image->width(), image->height(),
|
|
|
|
image->colorType(), image->alphaType(),
|
|
|
|
image->refColorSpace());
|
|
|
|
|
|
|
|
PromiseImageInfo& newImageInfo = fImageInfo.emplace_back(fImageInfo.count(),
|
|
|
|
image->uniqueID(),
|
|
|
|
overallII);
|
|
|
|
|
2018-10-29 20:26:02 +00:00
|
|
|
SkYUVASizeInfo yuvaSizeInfo;
|
2018-10-18 18:36:59 +00:00
|
|
|
SkYUVAIndex yuvaIndices[SkYUVAIndex::kIndexCount];
|
2018-09-27 18:26:47 +00:00
|
|
|
SkYUVColorSpace yuvColorSpace;
|
2018-10-29 20:26:02 +00:00
|
|
|
const void* planes[SkYUVASizeInfo::kMaxCount];
|
2018-10-18 18:36:59 +00:00
|
|
|
sk_sp<SkCachedData> yuvData = ib->getPlanes(&yuvaSizeInfo, yuvaIndices, &yuvColorSpace, planes);
|
2018-09-27 18:26:47 +00:00
|
|
|
if (yuvData) {
|
2018-10-18 18:36:59 +00:00
|
|
|
newImageInfo.setYUVData(std::move(yuvData), yuvaIndices, yuvColorSpace);
|
|
|
|
|
2018-10-22 18:12:03 +00:00
|
|
|
// determine colortypes from index data
|
|
|
|
// for testing we only ever use A8 or RGBA8888
|
2018-10-29 20:26:02 +00:00
|
|
|
SkColorType colorTypes[SkYUVASizeInfo::kMaxCount] = {
|
2018-10-22 18:12:03 +00:00
|
|
|
kUnknown_SkColorType, kUnknown_SkColorType,
|
|
|
|
kUnknown_SkColorType, kUnknown_SkColorType
|
|
|
|
};
|
|
|
|
for (int yuvIndex = 0; yuvIndex < SkYUVAIndex::kIndexCount; ++yuvIndex) {
|
|
|
|
int texIdx = yuvaIndices[yuvIndex].fIndex;
|
|
|
|
if (texIdx < 0) {
|
|
|
|
SkASSERT(SkYUVAIndex::kA_Index == yuvIndex);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (kUnknown_SkColorType == colorTypes[texIdx]) {
|
|
|
|
colorTypes[texIdx] = kAlpha_8_SkColorType;
|
|
|
|
} else {
|
|
|
|
colorTypes[texIdx] = kRGBA_8888_SkColorType;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-10-29 20:26:02 +00:00
|
|
|
for (int i = 0; i < SkYUVASizeInfo::kMaxCount; ++i) {
|
2018-10-22 18:12:03 +00:00
|
|
|
if (yuvaSizeInfo.fSizes[i].isEmpty()) {
|
|
|
|
SkASSERT(!yuvaSizeInfo.fWidthBytes[i] && kUnknown_SkColorType == colorTypes[i]);
|
2018-10-18 18:36:59 +00:00
|
|
|
continue;
|
|
|
|
}
|
2018-09-27 18:26:47 +00:00
|
|
|
|
2018-10-18 18:36:59 +00:00
|
|
|
SkImageInfo planeII = SkImageInfo::Make(yuvaSizeInfo.fSizes[i].fWidth,
|
|
|
|
yuvaSizeInfo.fSizes[i].fHeight,
|
2018-10-22 18:12:03 +00:00
|
|
|
colorTypes[i],
|
2018-10-18 18:36:59 +00:00
|
|
|
kUnpremul_SkAlphaType);
|
|
|
|
newImageInfo.addYUVPlane(i, planeII, planes[i], yuvaSizeInfo.fWidthBytes[i]);
|
2018-09-27 18:26:47 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
sk_sp<SkImage> rasterImage = image->makeRasterImage(); // force decoding of lazy images
|
2018-05-29 20:13:26 +00:00
|
|
|
|
2018-09-27 18:26:47 +00:00
|
|
|
SkBitmap tmp;
|
|
|
|
tmp.allocPixels(overallII);
|
2018-05-29 20:13:26 +00:00
|
|
|
|
2018-09-27 18:26:47 +00:00
|
|
|
if (!rasterImage->readPixels(tmp.pixmap(), 0, 0)) {
|
|
|
|
return -1;
|
|
|
|
}
|
2018-05-29 20:13:26 +00:00
|
|
|
|
2018-09-27 18:26:47 +00:00
|
|
|
tmp.setImmutable();
|
|
|
|
newImageInfo.setNormalBitmap(tmp);
|
2018-05-29 20:13:26 +00:00
|
|
|
}
|
2018-09-27 18:26:47 +00:00
|
|
|
// In either case newImageInfo's PromiseImageCallbackContext is filled in by uploadAllToGPU
|
2018-05-29 20:13:26 +00:00
|
|
|
|
|
|
|
return fImageInfo.count()-1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int DDLPromiseImageHelper::findOrDefineImage(SkImage* image) {
|
|
|
|
int preExistingID = this->findImage(image);
|
|
|
|
if (preExistingID >= 0) {
|
|
|
|
SkASSERT(this->isValidID(preExistingID));
|
|
|
|
return preExistingID;
|
|
|
|
}
|
|
|
|
|
|
|
|
int newID = this->addImage(image);
|
|
|
|
SkASSERT(this->isValidID(newID));
|
|
|
|
return newID;
|
|
|
|
}
|