| Index: src/gpu/GrFragmentProcessor.cpp
|
| diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp
|
| index d1a3fa161e405e96a9572526123d3ebbc3546a18..ec5aaac3ee6918a414bd27086ea2c8f565a24219 100644
|
| --- a/src/gpu/GrFragmentProcessor.cpp
|
| +++ b/src/gpu/GrFragmentProcessor.cpp
|
| @@ -10,6 +10,7 @@
|
| #include "GrCoordTransform.h"
|
| #include "gl/GrGLFragmentProcessor.h"
|
| #include "gl/builders/GrGLProgramBuilder.h"
|
| +#include "glsl/GrGLSLProgramDataManager.h"
|
| #include "effects/GrConstColorProcessor.h"
|
| #include "effects/GrXfermodeFragmentProcessor.h"
|
|
|
| @@ -231,12 +232,12 @@ const GrFragmentProcessor* GrFragmentProcessor::OverrideInput(const GrFragmentPr
|
| }
|
|
|
| private:
|
| - void onSetData(const GrGLProgramDataManager& pdman,
|
| + void onSetData(const GrGLSLProgramDataManager& pdman,
|
| const GrProcessor& fp) override {
|
| GrColor color = fp.cast<ReplaceInputFragmentProcessor>().fColor;
|
| if (!fHaveSetColor || color != fPreviousColor) {
|
| - static const GrGLfloat scale = 1.f / 255.f;
|
| - GrGLfloat floatColor[4] = {
|
| + static const float scale = 1.f / 255.f;
|
| + float floatColor[4] = {
|
| GrColorUnpackR(color) * scale,
|
| GrColorUnpackG(color) * scale,
|
| GrColorUnpackB(color) * scale,
|
| @@ -248,7 +249,7 @@ const GrFragmentProcessor* GrFragmentProcessor::OverrideInput(const GrFragmentPr
|
| }
|
| }
|
|
|
| - GrGLProgramDataManager::UniformHandle fColorUni;
|
| + GrGLSLProgramDataManager::UniformHandle fColorUni;
|
| bool fHaveSetColor;
|
| GrColor fPreviousColor;
|
| };
|
|
|