AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
b03b80066b
skia2/tests/PromiseImageTest.cpp

918 lines
44 KiB
C++
Raw Normal View History

Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +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.
*/
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
#include "SkExchange.h"
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
#include "Test.h"
#include "GrBackendSurface.h"
#include "GrContextPriv.h"
#include "GrGpu.h"
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
#include "GrTexture.h"
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
#include "SkImage_Gpu.h"
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
#include "SkPromiseImageTexture.h"
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
using namespace sk_gpu_test;
struct PromiseTextureChecker {
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
// shared indicates whether the backend texture is used to fulfill more than one promise
// image.
explicit PromiseTextureChecker(const GrBackendTexture& tex, skiatest::Reporter* reporter,
bool shared)
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
: fTexture(SkPromiseImageTexture::Make(tex))
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
, fReporter(reporter)
, fShared(shared)
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
, fFulfillCount(0)
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
, fReleaseCount(0)
, fDoneCount(0) {}
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
sk_sp<SkPromiseImageTexture> fTexture;
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
skiatest::Reporter* fReporter;
bool fShared;
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
int fFulfillCount;
int fReleaseCount;
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
int fDoneCount;
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
GrBackendTexture fLastFulfilledTexture;
/**
* Replaces the backend texture that this checker will return from fulfill. Also, transfers
* ownership of the previous PromiseImageTexture to the caller, if they want to control when
* it is deleted. The default argument will remove the existing texture without installing a
* valid replacement.
*/
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
sk_sp<const SkPromiseImageTexture> replaceTexture(
const GrBackendTexture& tex = GrBackendTexture()) {
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
return skstd::exchange(fTexture, SkPromiseImageTexture::Make(tex));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
}
SkTArray<GrUniqueKey> uniqueKeys() const {
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
return fTexture->testingOnly_uniqueKeysToInvalidate();
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
}
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
static sk_sp<SkPromiseImageTexture> Fulfill(void* self) {
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
auto checker = static_cast<PromiseTextureChecker*>(self);
checker->fFulfillCount++;
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
checker->fLastFulfilledTexture = checker->fTexture->backendTexture();
return checker->fTexture;
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
}
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
static void Release(void* self) {
auto checker = static_cast<PromiseTextureChecker*>(self);
checker->fReleaseCount++;
if (!checker->fShared) {
// This is only used in a single threaded fashion with a single promise image. So
// every fulfill should be balanced by a release before the next fulfill.
REPORTER_ASSERT(checker->fReporter, checker->fReleaseCount == checker->fFulfillCount);
}
}
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
static void Done(void* self) {
static_cast<PromiseTextureChecker*>(self)->fDoneCount++;
}
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
};
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
enum class ReleaseBalanceExpecation {
kBalanced,
kBalancedOrPlusOne,
kAny
};
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
static bool check_fulfill_and_release_cnts(const PromiseTextureChecker& promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
ReleaseBalanceExpecation balanceExpecation,
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
int expectedFulfillCnt,
int expectedReleaseCnt,
bool expectedRequired,
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
int expectedDoneCnt,
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
skiatest::Reporter* reporter) {
bool result = true;
int countDiff = promiseChecker.fFulfillCount - promiseChecker.fReleaseCount;
// FulfillCount should always equal ReleaseCount or be at most one higher
if (countDiff != 0) {
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
if (balanceExpecation == ReleaseBalanceExpecation::kBalanced) {
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
result = false;
REPORTER_ASSERT(reporter, 0 == countDiff);
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
} else if (countDiff != 1 &&
balanceExpecation == ReleaseBalanceExpecation::kBalancedOrPlusOne) {
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
result = false;
REPORTER_ASSERT(reporter, 0 == countDiff || 1 == countDiff);
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
} else if (countDiff < 0) {
result = false;
REPORTER_ASSERT(reporter, countDiff >= 0);
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
}
}
int fulfillDiff = expectedFulfillCnt - promiseChecker.fFulfillCount;
REPORTER_ASSERT(reporter, fulfillDiff >= 0);
if (fulfillDiff != 0) {
if (expectedRequired) {
result = false;
REPORTER_ASSERT(reporter, expectedFulfillCnt == promiseChecker.fFulfillCount);
} else if (fulfillDiff > 1) {
result = false;
REPORTER_ASSERT(reporter, fulfillDiff <= 1);
}
}
int releaseDiff = expectedReleaseCnt - promiseChecker.fReleaseCount;
REPORTER_ASSERT(reporter, releaseDiff >= 0);
if (releaseDiff != 0) {
if (expectedRequired) {
result = false;
REPORTER_ASSERT(reporter, expectedReleaseCnt == promiseChecker.fReleaseCount);
} else if (releaseDiff > 1) {
result = false;
REPORTER_ASSERT(reporter, releaseDiff <= 1);
}
}
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
if (expectedDoneCnt != promiseChecker.fDoneCount) {
result = false;
REPORTER_ASSERT(reporter, expectedDoneCnt == promiseChecker.fDoneCount);
}
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
return result;
}
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(PromiseImageTestNoDelayedRelease, reporter, ctxInfo) {
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
const int kWidth = 10;
const int kHeight = 10;
GrContext* ctx = ctxInfo.grContext();
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
GrGpu* gpu = ctx->priv().getGpu();
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
for (bool releaseImageEarly : {true, false}) {
GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture(
Add rowBytes to createTestingOnlyBackendTexture This is pulled out of: https://skia-review.googlesource.com/c/skia/+/151983 (Test YUV images in DDL) The YUV images seem to like to have row padding. Change-Id: I517d2b63678beeafef88f86148fca15862176780 Reviewed-on: https://skia-review.googlesource.com/156367 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2018-09-25 13:31:10 +00:00
nullptr, kWidth, kHeight, GrColorType::kRGBA_8888, true, GrMipMapped::kNo);
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
REPORTER_ASSERT(reporter, backendTex.isValid());
Reduce the number of backend->pixelconfig GrCaps virtuals. Moves method to get GrBackendFormat from GrBackendTexture from GrCaps to GrBackendTexture so that a GrContext is not required. Uses kUnknown_GrPixelConfig as failure return from GrCaps functions rather than an GrPixelConfig* out param and bool result. Having the texture type be part of GrBackendFormat made removing the GrCaps function that goes from GrBackendRenderTarget to GrPixelConfig awkward so that was left alone for now. Change-Id: If9be0f898c538be4a7b24022b6011f63441a0317 Reviewed-on: https://skia-review.googlesource.com/c/175991 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2018-12-14 14:18:50 +00:00
GrBackendFormat backendFormat = backendTex.getBackendFormat();
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
REPORTER_ASSERT(reporter, backendFormat.isValid());
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
PromiseTextureChecker promiseChecker(backendTex, reporter, false);
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
GrSurfaceOrigin texOrigin = kTopLeft_GrSurfaceOrigin;
sk_sp<SkImage> refImg(
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
SkImage_Gpu::MakePromiseTexture(
ctx, backendFormat, kWidth, kHeight,
GrMipMapped::kNo, texOrigin,
kRGBA_8888_SkColorType, kPremul_SkAlphaType,
nullptr,
PromiseTextureChecker::Fulfill,
PromiseTextureChecker::Release,
PromiseTextureChecker::Done,
&promiseChecker,
SkDeferredDisplayListRecorder::DelayReleaseCallback::kNo));
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info);
SkCanvas* canvas = surface->getCanvas();
int expectedFulfillCnt = 0;
int expectedReleaseCnt = 0;
int expectedDoneCnt = 0;
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
ReleaseBalanceExpecation balanceExpecation = ReleaseBalanceExpecation::kBalanced;
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
canvas->drawImage(refImg, 0, 0);
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
Add outline of new GrContext hierarchy This begins the process of splitting GrContext into: GrContext_Base, GrImageContext, GrRecordingContext and GrDirectContext. Change-Id: I3c43045f2a5549b049e95791d65f74d4e16de36f Reviewed-on: https://skia-review.googlesource.com/c/186878 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-01-30 18:08:28 +00:00
bool isVulkan = GrBackendApi::kVulkan == ctx->backend();
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
canvas->flush();
expectedFulfillCnt++;
expectedReleaseCnt++;
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
if (isVulkan) {
balanceExpecation = ReleaseBalanceExpecation::kBalancedOrPlusOne;
}
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
gpu->testingOnly_flushGpuAndSync();
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation = ReleaseBalanceExpecation::kBalanced;
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
canvas->drawImage(refImg, 0, 0);
canvas->drawImage(refImg, 0, 0);
canvas->flush();
expectedFulfillCnt++;
expectedReleaseCnt++;
gpu->testingOnly_flushGpuAndSync();
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
// Now test code path on Vulkan where we released the texture, but the GPU isn't done with
// resource yet and we do another draw. We should only call fulfill on the first draw and
// use the cached GrBackendTexture on the second. Release should only be called after the
// second draw is finished.
canvas->drawImage(refImg, 0, 0);
canvas->flush();
expectedFulfillCnt++;
expectedReleaseCnt++;
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
if (isVulkan) {
balanceExpecation = ReleaseBalanceExpecation::kBalancedOrPlusOne;
}
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
canvas->drawImage(refImg, 0, 0);
if (releaseImageEarly) {
refImg.reset();
}
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
canvas->flush();
expectedFulfillCnt++;
gpu->testingOnly_flushGpuAndSync();
expectedReleaseCnt++;
if (releaseImageEarly) {
expectedDoneCnt++;
}
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation = ReleaseBalanceExpecation::kBalanced;
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
expectedFulfillCnt = promiseChecker.fFulfillCount;
expectedReleaseCnt = promiseChecker.fReleaseCount;
if (!releaseImageEarly) {
refImg.reset();
expectedDoneCnt++;
}
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Add DoneProc to Promise Images This proc will notify the client when we will no longer call fulfill on their promise image so that can delete any meta data they needed to store to be able to complete the fulfill requests. Bug: skia: Change-Id: Ife1e6845f221c31ce1ae2c0d2ba5e4c8f0203b74 Reviewed-on: https://skia-review.googlesource.com/114092 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-03-16 18:57:21 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
gpu->deleteTestingOnlyBackendTexture(backendTex);
}
Add promise images for deferred instantiation of wrapped gpu textures This will allow a client to make an SkImage that "wraps" a gpu texture, however the client does need to supply the actual gpu texture at Image creation time. Instead it is retrieve at flush time via a callback. Bug: skia: Change-Id: I6267a55ab7102101a7bd80a6f547b6a870d2df08 Reviewed-on: https://skia-review.googlesource.com/109021 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Cary Clark <caryclark@google.com>
2018-03-09 17:05:04 +00:00
}
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(PromiseImageTestDelayedRelease, reporter, ctxInfo) {
const int kWidth = 10;
const int kHeight = 10;
GrContext* ctx = ctxInfo.grContext();
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
GrGpu* gpu = ctx->priv().getGpu();
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture(
nullptr, kWidth, kHeight, GrColorType::kRGBA_8888, true, GrMipMapped::kNo);
REPORTER_ASSERT(reporter, backendTex.isValid());
GrBackendFormat backendFormat = backendTex.getBackendFormat();
REPORTER_ASSERT(reporter, backendFormat.isValid());
PromiseTextureChecker promiseChecker(backendTex, reporter, false);
GrSurfaceOrigin texOrigin = kTopLeft_GrSurfaceOrigin;
sk_sp<SkImage> refImg(
SkImage_Gpu::MakePromiseTexture(
ctx, backendFormat, kWidth, kHeight,
GrMipMapped::kNo, texOrigin,
kRGBA_8888_SkColorType, kPremul_SkAlphaType,
nullptr,
PromiseTextureChecker::Fulfill,
PromiseTextureChecker::Release,
PromiseTextureChecker::Done,
&promiseChecker,
SkDeferredDisplayListRecorder::DelayReleaseCallback::kYes));
SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info);
SkCanvas* canvas = surface->getCanvas();
int expectedFulfillCnt = 0;
int expectedReleaseCnt = 0;
int expectedDoneCnt = 0;
ReleaseBalanceExpecation balanceExpecation = ReleaseBalanceExpecation::kBalanced;
canvas->drawImage(refImg, 0, 0);
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
balanceExpecation,
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
bool isVulkan = GrBackendApi::kVulkan == ctx->backend();
canvas->flush();
expectedFulfillCnt++;
// Because we've delayed release, we expect a +1 balance.
balanceExpecation = ReleaseBalanceExpecation::kBalancedOrPlusOne;
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
balanceExpecation,
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
gpu->testingOnly_flushGpuAndSync();
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
balanceExpecation,
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
canvas->drawImage(refImg, 0, 0);
canvas->drawImage(refImg, 0, 0);
canvas->flush();
gpu->testingOnly_flushGpuAndSync();
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
balanceExpecation,
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
canvas->drawImage(refImg, 0, 0);
canvas->flush();
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
balanceExpecation,
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
canvas->drawImage(refImg, 0, 0);
refImg.reset();
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
balanceExpecation,
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
canvas->flush();
gpu->testingOnly_flushGpuAndSync();
// We released the image already and we flushed and synced.
balanceExpecation = ReleaseBalanceExpecation::kBalanced;
expectedReleaseCnt++;
expectedDoneCnt++;
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
balanceExpecation,
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
gpu->deleteTestingOnlyBackendTexture(backendTex);
}
// Tests replacing the backing texture for a promise image after a release and then refulfilling in
// the SkDeferredDisplayListRecorder::DelayReleaseCallback::kNo case.
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(PromiseImageTextureReuse, reporter, ctxInfo) {
const int kWidth = 10;
const int kHeight = 10;
GrContext* ctx = ctxInfo.grContext();
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
GrGpu* gpu = ctx->priv().getGpu();
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
GrBackendTexture backendTex1 = gpu->createTestingOnlyBackendTexture(
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
nullptr, kWidth, kHeight, GrColorType::kRGBA_8888, false, GrMipMapped::kNo);
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
GrBackendTexture backendTex2 = gpu->createTestingOnlyBackendTexture(
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
nullptr, kWidth, kHeight, GrColorType::kRGBA_8888, false, GrMipMapped::kNo);
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
GrBackendTexture backendTex3 = gpu->createTestingOnlyBackendTexture(
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
nullptr, kWidth, kHeight, GrColorType::kRGBA_8888, false, GrMipMapped::kNo);
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
REPORTER_ASSERT(reporter, backendTex1.isValid());
REPORTER_ASSERT(reporter, backendTex2.isValid());
REPORTER_ASSERT(reporter, backendTex3.isValid());
GrBackendFormat backendFormat = backendTex1.getBackendFormat();
REPORTER_ASSERT(reporter, backendFormat.isValid());
REPORTER_ASSERT(reporter, backendFormat == backendTex2.getBackendFormat());
REPORTER_ASSERT(reporter, backendFormat == backendTex3.getBackendFormat());
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
PromiseTextureChecker promiseChecker(backendTex1, reporter, true);
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
GrSurfaceOrigin texOrigin = kTopLeft_GrSurfaceOrigin;
sk_sp<SkImage> refImg(
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
SkImage_Gpu::MakePromiseTexture(
ctx, backendFormat, kWidth, kHeight,
GrMipMapped::kNo, texOrigin,
kRGBA_8888_SkColorType, kPremul_SkAlphaType,
nullptr,
PromiseTextureChecker::Fulfill,
PromiseTextureChecker::Release,
PromiseTextureChecker::Done,
&promiseChecker,
SkDeferredDisplayListRecorder::DelayReleaseCallback::kNo));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
SkImageInfo info =
SkImageInfo::Make(kWidth, kHeight, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info);
SkCanvas* canvas = surface->getCanvas();
int expectedFulfillCnt = 0;
int expectedReleaseCnt = 0;
int expectedDoneCnt = 0;
canvas->drawImage(refImg, 0, 0);
canvas->drawImage(refImg, 5, 5);
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
ReleaseBalanceExpecation balanceExpecation = ReleaseBalanceExpecation::kBalanced;
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
Add outline of new GrContext hierarchy This begins the process of splitting GrContext into: GrContext_Base, GrImageContext, GrRecordingContext and GrDirectContext. Change-Id: I3c43045f2a5549b049e95791d65f74d4e16de36f Reviewed-on: https://skia-review.googlesource.com/c/186878 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-01-30 18:08:28 +00:00
bool isVulkan = GrBackendApi::kVulkan == ctx->backend();
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
canvas->flush();
expectedFulfillCnt++;
expectedReleaseCnt++;
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
if (isVulkan) {
balanceExpecation = ReleaseBalanceExpecation::kBalancedOrPlusOne;
}
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
REPORTER_ASSERT(reporter, GrBackendTexture::TestingOnly_Equals(
promiseChecker.fLastFulfilledTexture, backendTex1));
// We should have put a GrTexture for this fulfillment into the cache.
auto keys = promiseChecker.uniqueKeys();
REPORTER_ASSERT(reporter, keys.count() == 1);
GrUniqueKey texKey1;
if (keys.count()) {
texKey1 = keys[0];
}
REPORTER_ASSERT(reporter, texKey1.isValid());
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
REPORTER_ASSERT(reporter, ctx->priv().resourceProvider()->findByUniqueKey<>(texKey1));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
gpu->testingOnly_flushGpuAndSync();
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation = ReleaseBalanceExpecation::kBalanced;
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
REPORTER_ASSERT(reporter,
GrBackendTexture::TestingOnly_Equals(
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
promiseChecker.replaceTexture()->backendTexture(), backendTex1));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
gpu->deleteTestingOnlyBackendTexture(backendTex1);
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
ctx->priv().getResourceCache()->purgeAsNeeded();
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
// We should have invalidated the key on the previously cached texture (after ensuring
// invalidation messages have been processed by calling purgeAsNeeded.)
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
REPORTER_ASSERT(reporter, !ctx->priv().resourceProvider()->findByUniqueKey<>(texKey1));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
promiseChecker.replaceTexture(backendTex2);
canvas->drawImage(refImg, 0, 0);
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
canvas->flush();
expectedFulfillCnt++;
expectedReleaseCnt++;
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
if (isVulkan) {
balanceExpecation = ReleaseBalanceExpecation::kBalancedOrPlusOne;
}
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
// Second texture should be in the cache.
keys = promiseChecker.uniqueKeys();
REPORTER_ASSERT(reporter, keys.count() == 1);
GrUniqueKey texKey2;
if (keys.count()) {
texKey2 = keys[0];
}
REPORTER_ASSERT(reporter, texKey2.isValid() && texKey2 != texKey1);
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
REPORTER_ASSERT(reporter, ctx->priv().resourceProvider()->findByUniqueKey<>(texKey2));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
!isVulkan,
expectedDoneCnt,
reporter));
REPORTER_ASSERT(reporter, GrBackendTexture::TestingOnly_Equals(
promiseChecker.fLastFulfilledTexture, backendTex2));
gpu->testingOnly_flushGpuAndSync();
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation = ReleaseBalanceExpecation::kBalanced;
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
// Because we have kept the SkPromiseImageTexture alive, we should be able to use it again and
// hit the cache.
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
ctx->priv().getResourceCache()->purgeAsNeeded();
REPORTER_ASSERT(reporter, ctx->priv().resourceProvider()->findByUniqueKey<>(texKey2));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
canvas->drawImage(refImg, 0, 0);
canvas->flush();
gpu->testingOnly_flushGpuAndSync();
expectedFulfillCnt++;
expectedReleaseCnt++;
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
// Make sure we didn't add another key and that the second texture is still alive in the cache.
keys = promiseChecker.uniqueKeys();
REPORTER_ASSERT(reporter, keys.count() == 1);
if (keys.count()) {
REPORTER_ASSERT(reporter, texKey2 == keys[0]);
}
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
ctx->priv().getResourceCache()->purgeAsNeeded();
REPORTER_ASSERT(reporter, ctx->priv().resourceProvider()->findByUniqueKey<>(texKey2));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
// Now we test keeping tex2 alive but fulfilling with a new texture.
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
sk_sp<const SkPromiseImageTexture> promiseImageTexture2 =
promiseChecker.replaceTexture(backendTex3);
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
REPORTER_ASSERT(reporter, GrBackendTexture::TestingOnly_Equals(
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
promiseImageTexture2->backendTexture(), backendTex2));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
canvas->drawImage(refImg, 0, 0);
canvas->flush();
gpu->testingOnly_flushGpuAndSync();
expectedFulfillCnt++;
expectedReleaseCnt++;
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
keys = promiseChecker.uniqueKeys();
REPORTER_ASSERT(reporter, keys.count() == 1);
GrUniqueKey texKey3;
if (keys.count()) {
texKey3 = keys[0];
}
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
ctx->priv().getResourceCache()->purgeAsNeeded();
REPORTER_ASSERT(reporter, !ctx->priv().resourceProvider()->findByUniqueKey<>(texKey2));
REPORTER_ASSERT(reporter, ctx->priv().resourceProvider()->findByUniqueKey<>(texKey3));
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
gpu->deleteTestingOnlyBackendTexture(promiseImageTexture2->backendTexture());
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
// Make a new promise image also backed by texture 3.
sk_sp<SkImage> refImg2(
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
SkImage_Gpu::MakePromiseTexture(
ctx, backendFormat, kWidth, kHeight,
GrMipMapped::kNo, texOrigin,
kRGBA_8888_SkColorType, kPremul_SkAlphaType,
nullptr,
PromiseTextureChecker::Fulfill,
PromiseTextureChecker::Release,
PromiseTextureChecker::Done,
&promiseChecker,
SkDeferredDisplayListRecorder::DelayReleaseCallback::kNo));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
canvas->drawImage(refImg, 0, 0);
canvas->drawImage(refImg2, 1, 1);
canvas->flush();
gpu->testingOnly_flushGpuAndSync();
expectedFulfillCnt += 2;
expectedReleaseCnt += 2;
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
// The two images should share a single GrTexture by using the same key. The key is only
// dependent on the pixel config and the PromiseImageTexture key.
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
keys = promiseChecker.uniqueKeys();
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
REPORTER_ASSERT(reporter, keys.count() == 1);
if (keys.count() > 0) {
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
REPORTER_ASSERT(reporter, texKey3 == keys[0]);
}
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
ctx->priv().getResourceCache()->purgeAsNeeded();
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
// If we delete the SkPromiseImageTexture we should trigger both key removals.
REPORTER_ASSERT(reporter,
GrBackendTexture::TestingOnly_Equals(
Make SkPromiseImageTexture ref counted. This makes the API easier to use in Chrome. It is no longer required to pass the SkPromiseImageTexture to the release proc. Bug: skia: Change-Id: I6636401f6a7915d3ad15e890718638bc91a58cc4 Reviewed-on: https://skia-review.googlesource.com/c/183383 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-11 21:03:19 +00:00
promiseChecker.replaceTexture()->backendTexture(), backendTex3));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
ctx->priv().getResourceCache()->purgeAsNeeded();
REPORTER_ASSERT(reporter, !ctx->priv().resourceProvider()->findByUniqueKey<>(texKey3));
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
gpu->deleteTestingOnlyBackendTexture(backendTex3);
// After deleting each image we should get a done call.
refImg.reset();
++expectedDoneCnt;
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
refImg2.reset();
++expectedDoneCnt;
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Revert "Revert "Reuse GrTexture instances when the same GrBackendTexture is used to"" This reverts commit 426ba463d54c7fdd6f3b94f88b66c10c0212dafd. Bug: skia:8613 Change-Id: Iacaf40549369110aa95015e8d4579ec41db22d13 Reviewed-on: https://skia-review.googlesource.com/c/182963 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-10 17:09:52 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
}
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(PromiseImageTextureReuseDifferentConfig, reporter, ctxInfo) {
// Try making two promise SkImages backed by the same texture but with different configs.
// This will only be testable on backends where a single texture format (8bit red unorm) can
// be used for alpha and gray image color types.
const int kWidth = 10;
const int kHeight = 10;
GrContext* ctx = ctxInfo.grContext();
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
GrGpu* gpu = ctx->priv().getGpu();
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
GrBackendTexture backendTex1 = gpu->createTestingOnlyBackendTexture(
nullptr, kWidth, kHeight, GrColorType::kGray_8, false, GrMipMapped::kNo);
REPORTER_ASSERT(reporter, backendTex1.isValid());
GrBackendTexture backendTex2 = gpu->createTestingOnlyBackendTexture(
nullptr, kWidth, kHeight, GrColorType::kAlpha_8, false, GrMipMapped::kNo);
REPORTER_ASSERT(reporter, backendTex2.isValid());
if (backendTex1.getBackendFormat() != backendTex2.getBackendFormat()) {
gpu->deleteTestingOnlyBackendTexture(backendTex1);
return;
}
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
// We only needed this texture to check that alpha and gray color types use the same format.
gpu->deleteTestingOnlyBackendTexture(backendTex2);
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
SkImageInfo info =
SkImageInfo::Make(kWidth, kHeight, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info);
SkCanvas* canvas = surface->getCanvas();
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
for (auto delayRelease : {SkDeferredDisplayListRecorder::DelayReleaseCallback::kNo,
SkDeferredDisplayListRecorder::DelayReleaseCallback::kYes}) {
PromiseTextureChecker promiseChecker(backendTex1, reporter, true);
sk_sp<SkImage> alphaImg(SkImage_Gpu::MakePromiseTexture(
ctx, backendTex1.getBackendFormat(), kWidth, kHeight, GrMipMapped::kNo,
kTopLeft_GrSurfaceOrigin, kAlpha_8_SkColorType, kPremul_SkAlphaType, nullptr,
PromiseTextureChecker::Fulfill, PromiseTextureChecker::Release,
PromiseTextureChecker::Done, &promiseChecker, delayRelease));
REPORTER_ASSERT(reporter, alphaImg);
sk_sp<SkImage> grayImg(SkImage_Gpu::MakePromiseTexture(
ctx, backendTex1.getBackendFormat(), kWidth, kHeight, GrMipMapped::kNo,
kBottomLeft_GrSurfaceOrigin, kGray_8_SkColorType, kOpaque_SkAlphaType, nullptr,
PromiseTextureChecker::Fulfill, PromiseTextureChecker::Release,
PromiseTextureChecker::Done, &promiseChecker, delayRelease));
REPORTER_ASSERT(reporter, grayImg);
canvas->drawImage(alphaImg, 0, 0);
canvas->drawImage(grayImg, 1, 1);
canvas->flush();
gpu->testingOnly_flushGpuAndSync();
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
int expectedFulfillCnt = 2;
int expectedReleaseCnt = 0;
int expectedDoneCnt = 0;
ReleaseBalanceExpecation balanceExpecation = ReleaseBalanceExpecation::kAny;
if (delayRelease == SkDeferredDisplayListRecorder::DelayReleaseCallback::kNo) {
expectedReleaseCnt = 2;
balanceExpecation = ReleaseBalanceExpecation::kBalanced;
}
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
balanceExpecation,
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
// Because they use different configs, each image should have created a different GrTexture
// and they both should still be cached.
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
ctx->priv().getResourceCache()->purgeAsNeeded();
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
auto keys = promiseChecker.uniqueKeys();
REPORTER_ASSERT(reporter, keys.count() == 2);
for (const auto& key : keys) {
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
auto surf = ctx->priv().resourceProvider()->findByUniqueKey<GrSurface>(key);
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
REPORTER_ASSERT(reporter, surf && surf->asTexture());
if (surf && surf->asTexture()) {
REPORTER_ASSERT(reporter,
!GrBackendTexture::TestingOnly_Equals(
backendTex1, surf->asTexture()->getBackendTexture()));
}
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
}
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
// Change the backing texture, this should invalidate the keys.
promiseChecker.replaceTexture();
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
ctx->priv().getResourceCache()->purgeAsNeeded();
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
for (const auto& key : keys) {
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
auto surf = ctx->priv().resourceProvider()->findByUniqueKey<GrSurface>(key);
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
REPORTER_ASSERT(reporter, !surf);
}
Make GrTexture caching for SkPromiseImageTexture work when same texture fulfills a different SkImage. Bug: skia:8613 Change-Id: I7ee14112c69f8aaef223a37dda455259b501a2bf Reviewed-on: https://skia-review.googlesource.com/c/184440 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2019-01-16 18:51:35 +00:00
}
gpu->deleteTestingOnlyBackendTexture(backendTex1);
}
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
DEF_GPUTEST(PromiseImageTextureShutdown, reporter, ctxInfo) {
const int kWidth = 10;
const int kHeight = 10;
// Different ways of killing contexts.
using DeathFn = std::function<void(sk_gpu_test::GrContextFactory*, GrContext*)>;
DeathFn destroy = [](sk_gpu_test::GrContextFactory* factory, GrContext* context) {
factory->destroyContexts();
};
DeathFn abandon = [](sk_gpu_test::GrContextFactory* factory, GrContext* context) {
context->abandonContext();
};
DeathFn releaseResourcesAndAbandon = [](sk_gpu_test::GrContextFactory* factory,
GrContext* context) {
context->releaseResourcesAndAbandonContext();
};
for (int type = 0; type < sk_gpu_test::GrContextFactory::kContextTypeCnt; ++type) {
auto contextType = static_cast<sk_gpu_test::GrContextFactory::ContextType>(type);
// These tests are difficult to get working with Vulkan. See http://skbug.com/8705
// and http://skbug.com/8275
GrBackendApi api = sk_gpu_test::GrContextFactory::ContextTypeBackend(contextType);
if (api == GrBackendApi::kVulkan) {
continue;
}
DeathFn contextKillers[] = {destroy, abandon, releaseResourcesAndAbandon};
for (auto contextDeath : contextKillers) {
sk_gpu_test::GrContextFactory factory;
auto ctx = factory.get(contextType);
if (!ctx) {
continue;
}
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
GrGpu* gpu = ctx->priv().getGpu();
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture(
nullptr, kWidth, kHeight, GrColorType::kAlpha_8, false, GrMipMapped::kNo);
REPORTER_ASSERT(reporter, backendTex.isValid());
SkImageInfo info = SkImageInfo::Make(kWidth, kHeight, kRGBA_8888_SkColorType,
kPremul_SkAlphaType);
sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info);
SkCanvas* canvas = surface->getCanvas();
PromiseTextureChecker promiseChecker(backendTex, reporter, false);
sk_sp<SkImage> image(SkImage_Gpu::MakePromiseTexture(
ctx, backendTex.getBackendFormat(), kWidth, kHeight, GrMipMapped::kNo,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
kTopLeft_GrSurfaceOrigin, kAlpha_8_SkColorType, kPremul_SkAlphaType, nullptr,
PromiseTextureChecker::Fulfill, PromiseTextureChecker::Release,
PromiseTextureChecker::Done, &promiseChecker,
SkDeferredDisplayListRecorder::DelayReleaseCallback::kNo));
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
REPORTER_ASSERT(reporter, image);
canvas->drawImage(image, 0, 0);
image.reset();
// If the surface still holds a ref to the context then the factory will not be able
// to destroy the context (and instead will release-all-and-abandon).
surface.reset();
ctx->flush();
contextDeath(&factory, ctx);
int expectedFulfillCnt = 1;
int expectedReleaseCnt = 1;
int expectedDoneCnt = 1;
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
ReleaseBalanceExpecation balanceExpecation = ReleaseBalanceExpecation::kBalanced;
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
REPORTER_ASSERT(reporter, check_fulfill_and_release_cnts(promiseChecker,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
balanceExpecation,
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
expectedFulfillCnt,
expectedReleaseCnt,
true,
expectedDoneCnt,
reporter));
}
}
}
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(PromiseImageTextureFullCache, reporter, ctxInfo) {
const int kWidth = 10;
const int kHeight = 10;
GrContext* ctx = ctxInfo.grContext();
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
GrGpu* gpu = ctx->priv().getGpu();
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture(
nullptr, kWidth, kHeight, GrColorType::kAlpha_8, false, GrMipMapped::kNo);
REPORTER_ASSERT(reporter, backendTex.isValid());
SkImageInfo info =
SkImageInfo::Make(kWidth, kHeight, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info);
SkCanvas* canvas = surface->getCanvas();
PromiseTextureChecker promiseChecker(backendTex, reporter, false);
sk_sp<SkImage> image(SkImage_Gpu::MakePromiseTexture(
ctx, backendTex.getBackendFormat(), kWidth, kHeight, GrMipMapped::kNo,
kTopLeft_GrSurfaceOrigin, kAlpha_8_SkColorType, kPremul_SkAlphaType, nullptr,
PromiseTextureChecker::Fulfill, PromiseTextureChecker::Release,
Add option to skip intermediate release/fulfill calls for promise images. SkiaRenderer does not delete promise image textures when they are released but not done. Refulfilling promise image textures takes a significant amount of CPU time. This allows us to fulfill each promise image once. Bug: skia:8736 Change-Id: I7ad7fa9678ed0ec4bb714b71fbf920ab4a845409 Reviewed-on: https://skia-review.googlesource.com/c/188039 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-30 22:28:20 +00:00
PromiseTextureChecker::Done, &promiseChecker,
SkDeferredDisplayListRecorder::DelayReleaseCallback::kNo));
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
REPORTER_ASSERT(reporter, image);
// Make the cache full. This tests that we don't preemptively purge cached textures for
// fulfillment due to cache pressure.
static constexpr int kMaxResources = 10;
static constexpr int kMaxBytes = 100;
ctx->setResourceCacheLimits(kMaxResources, kMaxBytes);
sk_sp<GrTexture> textures[2 * kMaxResources];
for (int i = 0; i < 2 * kMaxResources; ++i) {
GrSurfaceDesc desc;
desc.fConfig = kRGBA_8888_GrPixelConfig;
desc.fWidth = desc.fHeight = 100;
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
textures[i] = ctx->priv().resourceProvider()->createTexture(desc, SkBudgeted::kYes);
Change the meaning of GrBudgetedType::kUnbudgetedUncacheable. kUnbudgetedCacheable now means that the resource is never purged until its unique key is removed. This fixes an issue where a cached texture for a promise image might get purged by cache pressure. This in turn could cause Skia to call the promise image's Fulfill proc multiple times with no intervening Release calls. The balancing Release calls would occur, but the policy is that each Fulfill should be balanced by Release *before* another Fulfill. Update/add unit tests. Bug: chromium:922851 Change-Id: I6411e413b3104721ca4bb6e7f07b3b73d14cbcf9 Reviewed-on: https://skia-review.googlesource.com/c/186361 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2019-01-24 17:18:33 +00:00
REPORTER_ASSERT(reporter, textures[i]);
}
// Relying on the asserts in the promiseImageChecker to ensure that fulfills and releases are
// properly ordered.
canvas->drawImage(image, 0, 0);
canvas->flush();
canvas->drawImage(image, 1, 0);
canvas->flush();
canvas->drawImage(image, 2, 0);
canvas->flush();
canvas->drawImage(image, 3, 0);
canvas->flush();
canvas->drawImage(image, 4, 0);
canvas->flush();
canvas->drawImage(image, 5, 0);
canvas->flush();
// Must call this to ensure that all callbacks are performed before the checker is destroyed.
gpu->testingOnly_flushGpuAndSync();
gpu->deleteTestingOnlyBackendTexture(backendTex);
}
Reference in New Issue Copy Permalink