Index: src/gpu/effects/GrYUVtoRGBEffect.cpp |
diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/effects/GrYUVtoRGBEffect.cpp |
index e2825125e82ea5d6e41e18ab339c2ad6a23a8e25..58b9a0fd66ec5f6a35e61d4e4933d9814d89f2d6 100644 |
--- a/src/gpu/effects/GrYUVtoRGBEffect.cpp |
+++ b/src/gpu/effects/GrYUVtoRGBEffect.cpp |
@@ -52,7 +52,7 @@ public: |
return fColorSpace; |
} |
- class GLProcessor : public GrGLSLFragmentProcessor { |
+ class GLSLProcessor : public GrGLSLFragmentProcessor { |
public: |
static const float kJPEGConversionMatrix[16]; |
static const float kRec601ConversionMatrix[16]; |
@@ -61,7 +61,7 @@ public: |
// this class always generates the same code. |
static void GenKey(const GrProcessor&, const GrGLSLCaps&, GrProcessorKeyBuilder*) {} |
- GLProcessor(const GrProcessor&) {} |
+ GLSLProcessor(const GrProcessor&) {} |
virtual void emitCode(EmitArgs& args) override { |
GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); |
@@ -125,11 +125,13 @@ private: |
this->addTextureAccess(&fVAccess); |
} |
- GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } |
+ GrGLSLFragmentProcessor* onCreateGLSLInstance() const override { |
+ return new GLSLProcessor(*this); |
+ } |
- virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, |
- GrProcessorKeyBuilder* b) const override { |
- GLProcessor::GenKey(*this, caps, b); |
+ virtual void onGetGLSLProcessorKey(const GrGLSLCaps& caps, |
+ GrProcessorKeyBuilder* b) const override { |
+ GLSLProcessor::GenKey(*this, caps, b); |
} |
bool onIsEqual(const GrFragmentProcessor& sBase) const override { |
@@ -154,17 +156,17 @@ private: |
typedef GrFragmentProcessor INHERITED; |
}; |
-const float YUVtoRGBEffect::GLProcessor::kJPEGConversionMatrix[16] = { |
+const float YUVtoRGBEffect::GLSLProcessor::kJPEGConversionMatrix[16] = { |
1.0f, 0.0f, 1.402f, -0.701f, |
1.0f, -0.34414f, -0.71414f, 0.529f, |
1.0f, 1.772f, 0.0f, -0.886f, |
0.0f, 0.0f, 0.0f, 1.0}; |
-const float YUVtoRGBEffect::GLProcessor::kRec601ConversionMatrix[16] = { |
+const float YUVtoRGBEffect::GLSLProcessor::kRec601ConversionMatrix[16] = { |
1.164f, 0.0f, 1.596f, -0.87075f, |
1.164f, -0.391f, -0.813f, 0.52925f, |
1.164f, 2.018f, 0.0f, -1.08175f, |
0.0f, 0.0f, 0.0f, 1.0}; |
-const float YUVtoRGBEffect::GLProcessor::kRec709ConversionMatrix[16] = { |
+const float YUVtoRGBEffect::GLSLProcessor::kRec709ConversionMatrix[16] = { |
1.164f, 0.0f, 1.793f, -0.96925f, |
1.164f, -0.213f, -0.533f, 0.30025f, |
1.164f, 2.112f, 0.0f, -1.12875f, |