aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/effects
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2015-10-09 13:36:42 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-10-09 13:36:42 -0700
commitf276ac5c16d39a2b877300d760041f0291bb5ec9 (patch)
tree18f612b69351d42440f19e51347d14bfd182b91d /src/gpu/effects
parentcda8ec2b030c6fcb58d2d11f4983a14c0f355235 (diff)
Move functions from SkGr to SkGrPriv.h
Diffstat (limited to 'src/gpu/effects')
-rw-r--r--src/gpu/effects/GrTextureStripAtlas.cpp4
-rw-r--r--src/gpu/effects/GrXfermodeFragmentProcessor.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/effects/GrTextureStripAtlas.cpp b/src/gpu/effects/GrTextureStripAtlas.cpp
index ca688d821b..f2133d12f2 100644
--- a/src/gpu/effects/GrTextureStripAtlas.cpp
+++ b/src/gpu/effects/GrTextureStripAtlas.cpp
@@ -7,9 +7,11 @@
*/
#include "GrTextureStripAtlas.h"
+#include "GrContext.h"
+#include "GrTexture.h"
+#include "SkGr.h"
#include "SkPixelRef.h"
#include "SkTSearch.h"
-#include "GrTexture.h"
#ifdef SK_DEBUG
#define VALIDATE this->validate()
diff --git a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
index ec2f1f3130..895838f673 100644
--- a/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
+++ b/src/gpu/effects/GrXfermodeFragmentProcessor.cpp
@@ -11,7 +11,7 @@
#include "effects/GrConstColorProcessor.h"
#include "gl/GrGLSLBlend.h"
#include "gl/builders/GrGLProgramBuilder.h"
-#include "SkGr.h"
+#include "SkGrPriv.h"
class ComposeTwoFragmentProcessor : public GrFragmentProcessor {
public: