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

Unified Diff: src/gpu/gl/builders/GrGLShaderBuilder.h

Issue 1425013003: Remove GrGLProcessor and create GrGLSLTextureSampler class. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove grglprocessor from gyp Created 5 years, 2 months 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/gl/builders/GrGLProgramBuilder.cpp ('k') | src/gpu/gl/builders/GrGLShaderBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/builders/GrGLShaderBuilder.h
diff --git a/src/gpu/gl/builders/GrGLShaderBuilder.h b/src/gpu/gl/builders/GrGLShaderBuilder.h
index b9bc72cc06b3ea7b2e787008e6fd2bb6a21a7906..b5efbf4f893fabf891fbedca7c02579daab7a6f7 100644
--- a/src/gpu/gl/builders/GrGLShaderBuilder.h
+++ b/src/gpu/gl/builders/GrGLShaderBuilder.h
@@ -19,15 +19,13 @@
class GrGLCaps;
class GrGLContextInfo;
class GrGLProgramBuilder;
+class GrGLSLTextureSampler;
/**
base class for all shaders builders
*/
class GrGLShaderBuilder {
public:
- typedef GrGLProcessor::TransformedCoordsArray TransformedCoordsArray;
- typedef GrGLProcessor::TextureSampler TextureSampler;
-
GrGLShaderBuilder(GrGLProgramBuilder* program);
void addInput(const GrGLSLShaderVar& input) { fInputs.push_back(input); }
@@ -45,24 +43,25 @@ public:
*/
/** Appends a 2D texture sample with projection if necessary. coordType must either be Vec2f or
Vec3f. The latter is interpreted as projective texture coords. The vec length and swizzle
- order of the result depends on the GrTextureAccess associated with the TextureSampler. */
+ order of the result depends on the GrTextureAccess associated with the GrGLSLTextureSampler.
+ */
void appendTextureLookup(SkString* out,
- const TextureSampler&,
+ const GrGLSLTextureSampler&,
const char* coordName,
GrSLType coordType = kVec2f_GrSLType) const;
/** Version of above that appends the result to the fragment shader code instead.*/
- void appendTextureLookup(const TextureSampler&,
+ void appendTextureLookup(const GrGLSLTextureSampler&,
const char* coordName,
GrSLType coordType = kVec2f_GrSLType);
/** Does the work of appendTextureLookup and modulates the result by modulation. The result is
- always a vec4. modulation and the swizzle specified by TextureSampler must both be vec4 or
- float. If modulation is "" or nullptr it this function acts as though appendTextureLookup were
- called. */
+ always a vec4. modulation and the swizzle specified by GrGLSLTextureSampler must both be
+ vec4 or float. If modulation is "" or nullptr it this function acts as though
+ appendTextureLookup were called. */
void appendTextureLookupAndModulate(const char* modulation,
- const TextureSampler&,
+ const GrGLSLTextureSampler&,
const char* coordName,
GrSLType coordType = kVec2f_GrSLType);
« no previous file with comments | « src/gpu/gl/builders/GrGLProgramBuilder.cpp ('k') | src/gpu/gl/builders/GrGLShaderBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698