diff options
author | joshualitt <joshualitt@chromium.org> | 2015-09-11 10:44:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-11 10:44:14 -0700 |
commit | e7afc2d85ba1db71ef8938ce3459cd78b30f71db (patch) | |
tree | 00b2b7f563a77a8e6fd42e43fa6fd5cbe6b43df7 /src/gpu/gl/GrGLPrimitiveProcessor.h | |
parent | 6efbe0537732a729d5bd500707dd0d8b0fc83553 (diff) |
Start trying to collapse path program stuff
BUG=skia:
Review URL: https://codereview.chromium.org/1333273003
Diffstat (limited to 'src/gpu/gl/GrGLPrimitiveProcessor.h')
-rw-r--r-- | src/gpu/gl/GrGLPrimitiveProcessor.h | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.h b/src/gpu/gl/GrGLPrimitiveProcessor.h index 4f2a4848b4..ce413f3338 100644 --- a/src/gpu/gl/GrGLPrimitiveProcessor.h +++ b/src/gpu/gl/GrGLPrimitiveProcessor.h @@ -72,30 +72,11 @@ public: protected: void setupUniformColor(GrGLGPBuilder* pb, const char* outputName, UniformHandle* colorUniform); - class ShaderVarHandle { - public: - bool isValid() const { return fHandle > -1; } - ShaderVarHandle() : fHandle(-1) {} - ShaderVarHandle(int value) : fHandle(value) { SkASSERT(this->isValid()); } - int handle() const { SkASSERT(this->isValid()); return fHandle; } - UniformHandle convertToUniformHandle() { - SkASSERT(this->isValid()); - return GrGLProgramDataManager::UniformHandle::CreateFromUniformIndex(fHandle); - } - SeparableVaryingHandle convertToSeparableVaryingHandle() { - SkASSERT(this->isValid()); - return SeparableVaryingHandle::CreateFromSeparableVaryingIndex(fHandle); - } - - private: - int fHandle; - }; - struct Transform { Transform() : fType(kVoid_GrSLType) { fCurrentValue = SkMatrix::InvalidMatrix(); } - ShaderVarHandle fHandle; - SkMatrix fCurrentValue; - GrSLType fType; + GrGLProgramDataManager::UniformHandle fHandle; + SkMatrix fCurrentValue; + GrSLType fType; }; SkSTArray<8, SkSTArray<2, Transform, true> > fInstalledTransforms; |