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

Unified Diff: src/gpu/gl/GrGLProgramDataManager.h

Issue 1462123003: Create GrGLSLVaryingHandler class for program building (Closed) Base URL: https://skia.googlesource.com/skia.git@putCapsOnArgs
Patch Set: fix release builder 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/gl/GrGLProgram.cpp ('k') | src/gpu/gl/GrGLProgramDataManager.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLProgramDataManager.h
diff --git a/src/gpu/gl/GrGLProgramDataManager.h b/src/gpu/gl/GrGLProgramDataManager.h
index ea7b19e0346b294a2ab353c8d2e192feafdc3e6f..d47745334d4214964836712b2d43d2851664db1f 100644
--- a/src/gpu/gl/GrGLProgramDataManager.h
+++ b/src/gpu/gl/GrGLProgramDataManager.h
@@ -33,7 +33,7 @@ public:
GrGLint fLocation;
};
- struct SeparableVaryingInfo {
+ struct VaryingInfo {
GrGLSLShaderVar fVariable;
GrGLint fLocation;
};
@@ -42,10 +42,10 @@ public:
// after they are inserted. Users of GrGLShaderBuilder get refs to the vars and ptrs to their
// name strings. Otherwise, we'd have to hand out copies.
typedef GrTAllocator<UniformInfo> UniformInfoArray;
- typedef GrTAllocator<SeparableVaryingInfo> SeparableVaryingInfoArray;
+ typedef GrTAllocator<VaryingInfo> VaryingInfoArray;
GrGLProgramDataManager(GrGLGpu*, GrGLuint programID, const UniformInfoArray&,
- const SeparableVaryingInfoArray&);
+ const VaryingInfoArray&);
/** Functions for uploading uniform values. The varities ending in v can be used to upload to an
* array of uniforms. arrayCount must be <= the array count of the uniform.
@@ -71,7 +71,7 @@ public:
void setSkMatrix(UniformHandle, const SkMatrix&) const override;
// for nvpr only
- void setPathFragmentInputTransform(SeparableVaryingHandle u, int components,
+ void setPathFragmentInputTransform(VaryingHandle u, int components,
const SkMatrix& matrix) const override;
private:
@@ -89,9 +89,9 @@ private:
};
enum {
- kUnusedSeparableVarying = -1,
+ kUnusedPathProcVarying = -1,
};
- struct SeparableVarying {
+ struct PathProcVarying {
GrGLint fLocation;
SkDEBUGCODE(
GrSLType fType;
@@ -102,7 +102,7 @@ private:
SkDEBUGCODE(void printUnused(const Uniform&) const;)
SkTArray<Uniform, true> fUniforms;
- SkTArray<SeparableVarying, true> fSeparableVaryings;
+ SkTArray<PathProcVarying, true> fPathProcVaryings;
GrGLGpu* fGpu;
GrGLuint fProgramID;
« no previous file with comments | « src/gpu/gl/GrGLProgram.cpp ('k') | src/gpu/gl/GrGLProgramDataManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698