Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Copy shaders" into lmp-dev

Browse Source
This commit is contained in:
John Reck
2014-08-26 14:53:33 +00:00
committed by Android (Google) Code Review
parent c931cc0850 c1469f39b5
commit 1698297daf
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/android/graphics/Shader.cpp
View File

@@ -66,6 +66,7 @@ static void Shader_setLocalMatrix(JNIEnv* env, jobject o, jlong shaderHandle, jl
} else {
shader->resetLocalMatrix();
}
shader->setGenerationID(shader->getGenerationID() + 1);
}
}

21
libs/hwui/DisplayListRenderer.h
View File

@@ -215,11 +215,17 @@ private:
if (!paint) return NULL;
const SkPaint* paintCopy = mPaintMap.valueFor(paint);
if (paintCopy == NULL || paintCopy->getGenerationID() != paint->getGenerationID()) {
paintCopy = new SkPaint(*paint);
if (paintCopy == NULL
|| paintCopy->getGenerationID() != paint->getGenerationID()
// We can't compare shader pointers because that will always
// change as we do partial copying via wrapping. However, if the
// shader changes the paint generationID will have changed and
// so we don't hit this comparison anyway
|| !(paint->getShader() && paintCopy->getShader()
&& paint->getShader()->getGenerationID() == paintCopy->getShader()->getGenerationID())) {
paintCopy = copyPaint(paint);
// replaceValueFor() performs an add if the entry doesn't exist
mPaintMap.replaceValueFor(paint, paintCopy);
mDisplayListData->paints.add(paintCopy);
}
return paintCopy;
@@ -228,8 +234,15 @@ private:
inline SkPaint* copyPaint(const SkPaint* paint) {
if (!paint) return NULL;
SkPaint* paintCopy = new SkPaint(*paint);
if (paint->getShader()) {
SkShader* shaderCopy = SkShader::CreateLocalMatrixShader(
paint->getShader(), paint->getShader()->getLocalMatrix());
paintCopy->setShader(shaderCopy);
paintCopy->setGenerationID(paint->getGenerationID());
shaderCopy->setGenerationID(paint->getShader()->getGenerationID());
shaderCopy->unref();
}
mDisplayListData->paints.add(paintCopy);
return paintCopy;
}