Separate out the texture matrix from the coord-system change matrix in GrSamplerState. This is a step towards moving texture matrix to GrCustomStage.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6721047
git-svn-id: http://skia.googlecode.com/svn/trunk@5973 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index be0f573..4fd6026 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -10,17 +10,20 @@
#ifndef GrContext_DEFINED
#define GrContext_DEFINED
-#include "GrConfig.h"
-#include "GrPaint.h"
+#include "GrColor.h"
#include "GrAARectRenderer.h"
#include "GrClipData.h"
+#include "GrMatrix.h"
+#include "GrPaint.h"
// not strictly needed but requires WK change in LayerTextureUpdaterCanvas to
// remove.
#include "GrRenderTarget.h"
-#include "SkClipStack.h"
+#include "GrRefCnt.h"
+#include "GrTexture.h"
class GrAutoScratchTexture;
class GrCacheKey;
+class GrCustomStage;
class GrDrawState;
class GrDrawTarget;
class GrFontCache;
@@ -33,6 +36,7 @@
class GrResourceEntry;
class GrResourceCache;
class GrStencilBuffer;
+class GrTextureParams;
class GrVertexBuffer;
class GrVertexBufferAllocPool;
class GrSoftwarePathRenderer;
@@ -711,7 +715,7 @@
this->restore();
if (NULL != paint) {
- if (!paint->preConcatSamplerMatricesWithInverse(context->getMatrix())) {
+ if (!paint->sourceCoordChangeByInverse(context->getMatrix())) {
return false;
}
}
@@ -749,7 +753,7 @@
*/
void preConcat(const GrMatrix& preConcat, GrPaint* paint = NULL) {
if (NULL != paint) {
- paint->preConcatSamplerMatrices(preConcat);
+ paint->sourceCoordChange(preConcat);
}
fContext->concatMatrix(preConcat);
}