Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: tests/GLProgramsTest.cpp

Issue 1434313002: Make all GrFragmentProcessors GL independent. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/glsl/GrGLSLUtil.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/GLProgramsTest.cpp
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index d1798fc8fa70e611f0e8cdd346f504a519450144..73d82078a825d22d3cbe9a7809db35ee93e2ece5 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -31,8 +31,8 @@
#include "effects/GrPorterDuffXferProcessor.h"
#include "effects/GrXfermodeFragmentProcessor.h"
-#include "gl/GrGLFragmentProcessor.h"
#include "gl/GrGLGpu.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramBuilder.h"
@@ -42,7 +42,7 @@
*/
static const uint32_t kMaxKeySize = 1024;
-class GLBigKeyProcessor : public GrGLFragmentProcessor {
+class GLBigKeyProcessor : public GrGLSLFragmentProcessor {
public:
GLBigKeyProcessor(const GrProcessor&) {}
@@ -63,7 +63,7 @@ public:
}
private:
- typedef GrGLFragmentProcessor INHERITED;
+ typedef GrGLSLFragmentProcessor INHERITED;
};
class BigKeyProcessor : public GrFragmentProcessor {
@@ -74,7 +74,7 @@ public:
const char* name() const override { return "Big Ole Key"; }
- GrGLFragmentProcessor* onCreateGLInstance() const override {
+ GrGLSLFragmentProcessor* onCreateGLInstance() const override {
return new GLBigKeyProcessor(*this);
}
@@ -110,17 +110,17 @@ public:
const char* name() const override { return "Block Input"; }
- GrGLFragmentProcessor* onCreateGLInstance() const override { return new GLFP; }
+ GrGLSLFragmentProcessor* onCreateGLInstance() const override { return new GLFP; }
private:
- class GLFP : public GrGLFragmentProcessor {
+ class GLFP : public GrGLSLFragmentProcessor {
public:
void emitCode(EmitArgs& args) override {
this->emitChild(0, nullptr, args);
}
private:
- typedef GrGLFragmentProcessor INHERITED;
+ typedef GrGLSLFragmentProcessor INHERITED;
};
BlockInputFragmentProcessor(const GrFragmentProcessor* child) {
« no previous file with comments | « src/gpu/glsl/GrGLSLUtil.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698