Index: src/effects/SkArithmeticMode_gpu.cpp |
diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp |
index e72ead8db81c5ffcebf1fef17cfca70155287ff1..dd015ca975cae4f3107bd438c61a1b1df6448a6e 100644 |
--- a/src/effects/SkArithmeticMode_gpu.cpp |
+++ b/src/effects/SkArithmeticMode_gpu.cpp |
@@ -15,8 +15,8 @@ |
#include "GrTexture.h" |
#include "gl/GrGLCaps.h" |
#include "gl/GrGLFragmentProcessor.h" |
-#include "gl/GrGLProgramDataManager.h" |
#include "gl/builders/GrGLProgramBuilder.h" |
+#include "glsl/GrGLSLProgramDataManager.h" |
static const bool gUseUnpremul = false; |
@@ -80,14 +80,14 @@ public: |
} |
protected: |
- void onSetData(const GrGLProgramDataManager& pdman, const GrProcessor& proc) override { |
+ void onSetData(const GrGLSLProgramDataManager& pdman, const GrProcessor& proc) override { |
const GrArithmeticFP& arith = proc.cast<GrArithmeticFP>(); |
pdman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4()); |
fEnforcePMColor = arith.enforcePMColor(); |
} |
private: |
- GrGLProgramDataManager::UniformHandle fKUni; |
+ GrGLSLProgramDataManager::UniformHandle fKUni; |
bool fEnforcePMColor; |
typedef GrGLFragmentProcessor INHERITED; |
@@ -218,14 +218,14 @@ private: |
add_arithmetic_code(fsBuilder, srcColor, dstColor, outColor, kUni, fEnforcePMColor); |
} |
- void onSetData(const GrGLProgramDataManager& pdman, |
+ void onSetData(const GrGLSLProgramDataManager& pdman, |
const GrXferProcessor& processor) override { |
const ArithmeticXP& arith = processor.cast<ArithmeticXP>(); |
pdman.set4f(fKUni, arith.k1(), arith.k2(), arith.k3(), arith.k4()); |
fEnforcePMColor = arith.enforcePMColor(); |
}; |
- GrGLProgramDataManager::UniformHandle fKUni; |
+ GrGLSLProgramDataManager::UniformHandle fKUni; |
bool fEnforcePMColor; |
typedef GrGLXferProcessor INHERITED; |