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

hold a ref on Key effects

Browse Source 
This ensures we never confuse a dead effect pointer in our cache for a
different live effect that happens to be allocated at the same address
as the old one.  Never seen it happen yet, but it's possible.

Change-Id: If8aff141fb6d0a4e10f13a153b154bb14f5a8c1a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/251442
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Reed <reed@google.com>
This commit is contained in:
Mike Klein 2019-10-29 14:36:33 -05:00 committed by Skia Commit-Bot
parent e4522dcf9a
commit f6a89fde46
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/SkVMBlitter.cpp
View File

@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
#include "include/core/SkColorFilter.h"
#include "include/private/SkMacros.h"
#include "src/core/SkArenaAlloc.h"
#include "src/core/SkBlendModePriv.h"
@ -20,13 +21,13 @@ namespace {
SK_BEGIN_REQUIRE_DENSE;
struct Key {
SkColorType colorType;
SkAlphaType alphaType;
Coverage coverage;
SkBlendMode blendMode;
SkColorSpace* colorSpace;
SkShader* shader;
SkColorFilter* colorFilter;
SkColorType colorType;
SkAlphaType alphaType;
Coverage coverage;
SkBlendMode blendMode;
sk_sp<SkColorSpace> colorSpace;
sk_sp<SkShader> shader;
sk_sp<SkColorFilter> colorFilter;
Key withCoverage(Coverage c) const {
Key k = *this;
@ -154,7 +155,7 @@ namespace {
if (key.shader) {
// TODO: maybe passing the whole Key is going to be what we'll want here?
if (!as_SB(key.shader)->program(nullptr,
key.colorSpace,
key.colorSpace.get(),
skvm::Arg{0}, 0,
nullptr,nullptr,nullptr,nullptr)) {
return false;
@ -192,7 +193,7 @@ namespace {
if (key.shader) {
skvm::I32 paint_alpha = src.a;
SkAssertResult(as_SB(key.shader)->program(this,
key.colorSpace,
key.colorSpace.get(),
uniforms, sizeof(Uniforms),
&src.r, &src.g, &src.b, &src.a));
@ -332,9 +333,9 @@ namespace {
device.alphaType(),
Coverage::Full,
paint.getBlendMode(),
device.colorSpace(),
paint.getShader(),
paint.getColorFilter(),
device.refColorSpace(),
paint.refShader(),
paint.refColorFilter(),
}
{
SkColor4f color = paint.getColor4f();
@ -411,10 +412,10 @@ namespace {
}
void updateUniforms() {
if (SkShaderBase* shader = as_SB(fKey.shader)) {
size_t extra = shader->uniforms(fKey.colorSpace, nullptr);
if (const SkShaderBase* shader = as_SB(fKey.shader)) {
size_t extra = shader->uniforms(fKey.colorSpace.get(), nullptr);
fUniforms.resize(sizeof(Uniforms) + extra);
shader->uniforms(fKey.colorSpace, fUniforms.data() + sizeof(Uniforms));
shader->uniforms(fKey.colorSpace.get(), fUniforms.data() + sizeof(Uniforms));
}
}