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

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

Issue 299943002: separate view matrix from rt adjustment (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase on tot: Created 6 years, 7 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/GrGLProgram.cpp ('k') | src/gpu/gl/GrGLShaderBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLShaderBuilder.h
diff --git a/src/gpu/gl/GrGLShaderBuilder.h b/src/gpu/gl/GrGLShaderBuilder.h
index 233bb524f50afee552074b9cdce7fc0adaa63102..1be9a881d342cdf3ce81c2e034978ae04747ee31 100644
--- a/src/gpu/gl/GrGLShaderBuilder.h
+++ b/src/gpu/gl/GrGLShaderBuilder.h
@@ -417,10 +417,17 @@ public:
int effectCnt,
GrGLSLExpr4* inOutFSColor) SK_OVERRIDE;
+ /**
+ * The view matrix uniform is only valid in the VS. It is always mat33.
+ */
GrGLUniformManager::UniformHandle getViewMatrixUniform() const {
return fViewMatrixUniform;
}
+ GrGLUniformManager::UniformHandle getRTAdjustmentVecUniform() const {
+ return fRTAdustmentVecUniform;
+ }
+
protected:
virtual bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const SK_OVERRIDE;
virtual void bindProgramLocations(GrGLuint programId) const SK_OVERRIDE;
@@ -444,7 +451,7 @@ private:
SkSTArray<10, AttributePair, true> fEffectAttributes;
GrGLUniformManager::UniformHandle fViewMatrixUniform;
-
+ GrGLUniformManager::UniformHandle fRTAdustmentVecUniform;
GrGLShaderVar* fPositionVar;
GrGLShaderVar* fLocalCoordsVar;
« no previous file with comments | « src/gpu/gl/GrGLProgram.cpp ('k') | src/gpu/gl/GrGLShaderBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698