Index: src/effects/SkArithmeticMode_gpu.cpp |
diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp |
index ebc8293b208db98b7a40edb927201b005defa4ff..2ab5172b57a2f6bbc7b639cedd3025d9c94135a4 100644 |
--- a/src/effects/SkArithmeticMode_gpu.cpp |
+++ b/src/effects/SkArithmeticMode_gpu.cpp |
@@ -13,9 +13,8 @@ |
#include "GrInvariantOutput.h" |
#include "GrProcessor.h" |
#include "GrTexture.h" |
-#include "gl/GrGLCaps.h" |
-#include "gl/GrGLFragmentProcessor.h" |
#include "gl/GrGLXferProcessor.h" |
+#include "glsl/GrGLSLFragmentProcessor.h" |
#include "glsl/GrGLSLFragmentShaderBuilder.h" |
#include "glsl/GrGLSLProgramBuilder.h" |
#include "glsl/GrGLSLProgramDataManager.h" |
@@ -54,7 +53,7 @@ static void add_arithmetic_code(GrGLSLFragmentBuilder* fsBuilder, |
} |
} |
-class GLArithmeticFP : public GrGLFragmentProcessor { |
+class GLArithmeticFP : public GrGLSLFragmentProcessor { |
public: |
GLArithmeticFP(const GrArithmeticFP& arithmeticFP) |
: fEnforcePMColor(arithmeticFP.enforcePMColor()) {} |
@@ -92,7 +91,7 @@ private: |
GrGLSLProgramDataManager::UniformHandle fKUni; |
bool fEnforcePMColor; |
- typedef GrGLFragmentProcessor INHERITED; |
+ typedef GrGLSLFragmentProcessor INHERITED; |
}; |
/////////////////////////////////////////////////////////////////////////////// |
@@ -111,7 +110,7 @@ void GrArithmeticFP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyB |
GLArithmeticFP::GenKey(*this, caps, b); |
} |
-GrGLFragmentProcessor* GrArithmeticFP::onCreateGLInstance() const { |
+GrGLSLFragmentProcessor* GrArithmeticFP::onCreateGLInstance() const { |
return new GLArithmeticFP(*this); |
} |