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

Merge "Reset draw modifiers after flushing" into jb-mr2-dev

Browse Source
This commit is contained in:
Chris Craik
2013-03-16 02:09:16 +00:00
committed by Android (Google) Code Review
parent bb131f52da d0afeac6df
commit c8a9fdff4b
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/DeferredDisplayList.cpp
View File

@@ -372,8 +372,8 @@ status_t DeferredDisplayList::flush(OpenGLRenderer& renderer, Rect& dirty) {
renderer.eventMark("Flush"); renderer.eventMark("Flush");
renderer.restoreToCount(1); renderer.restoreToCount(1);
status |= replayBatchList(mBatches, renderer, dirty); status |= replayBatchList(mBatches, renderer, dirty);
renderer.resetDrawModifiers();
DEFER_LOGD("--flush complete, returning %x", status); DEFER_LOGD("--flush complete, returning %x", status);

12
libs/hwui/OpenGLRenderer.cpp
View File

@@ -112,10 +112,7 @@ static const Blender gBlendsSwap[] = {
OpenGLRenderer::OpenGLRenderer(): OpenGLRenderer::OpenGLRenderer():
mCaches(Caches::getInstance()), mExtensions(Extensions::getInstance()) { mCaches(Caches::getInstance()), mExtensions(Extensions::getInstance()) {
mDrawModifiers.mShader = NULL; resetDrawModifiers();
mDrawModifiers.mColorFilter = NULL;
mDrawModifiers.mHasShadow = false;
mDrawModifiers.mHasDrawFilter = false;
memcpy(mMeshVertices, gMeshVertices, sizeof(gMeshVertices)); memcpy(mMeshVertices, gMeshVertices, sizeof(gMeshVertices));
@@ -1204,6 +1201,13 @@ void OpenGLRenderer::clearLayerRegions() {
// State Deferral // State Deferral
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
void OpenGLRenderer::resetDrawModifiers() {
mDrawModifiers.mShader = NULL;
mDrawModifiers.mColorFilter = NULL;
mDrawModifiers.mHasShadow = false;
mDrawModifiers.mHasDrawFilter = false;
}
bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDeferFlags) { bool OpenGLRenderer::storeDisplayState(DeferredDisplayState& state, int stateDeferFlags) {
const Rect& currentClip = *(mSnapshot->clipRect); const Rect& currentClip = *(mSnapshot->clipRect);
const mat4& currentMatrix = *(mSnapshot->transform); const mat4& currentMatrix = *(mSnapshot->transform);

1
libs/hwui/OpenGLRenderer.h
View File

@@ -274,6 +274,7 @@ public:
SkPaint* filterPaint(SkPaint* paint, bool alwaysCopy = false); SkPaint* filterPaint(SkPaint* paint, bool alwaysCopy = false);
void resetDrawModifiers();
bool storeDisplayState(DeferredDisplayState& state, int stateDeferFlags); bool storeDisplayState(DeferredDisplayState& state, int stateDeferFlags);
void restoreDisplayState(const DeferredDisplayState& state, int stateDeferFlags); void restoreDisplayState(const DeferredDisplayState& state, int stateDeferFlags);