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

Fix build break after r7411 when GR_STATIC_RECT_VB is enabled.

Browse Source 
Review URL: https://codereview.appspot.com/7220051

git-svn-id: http://skia.googlecode.com/svn/trunk@7415 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2013-01-28 16:46:55 +00:00
parent ef5dbe1cd9
commit cabe00eace
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/GrContext.cpp
View File

@ -837,7 +837,7 @@ void GrContext::drawRectToRect(const GrPaint& paint,
m.postConcat(*srcMatrix);
}
drawState->stage(GrPaint::kFirstColorStage)->preConcatCoordChange(m);
drawState->preConcatStageMatrices(kExplicitCoordMask, m);
const GrVertexBuffer* sqVB = fGpu->getUnitSquareVertexBuffer();
if (NULL == sqVB) {

8
src/gpu/GrDrawState.h
View File

@ -255,8 +255,14 @@ public:
* old coord system to the new coord system.
*/
void preConcatStageMatrices(const SkMatrix& preConcat) {
this->preConcatStageMatrices(~0U, preConcat);
}
/**
* Version of above that applies the update matrix selectively to stages via a mask.
*/
void preConcatStageMatrices(uint32_t stageMask, const SkMatrix& preConcat) {
for (int i = 0; i < kNumStages; ++i) {
if (this->isStageEnabled(i)) {
if (((1 << i) & stageMask) && this->isStageEnabled(i)) {
fStages[i].preConcatCoordChange(preConcat);
}
}