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

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

Issue 1192463003: Don't call bindTexture from GrGLProgram (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 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
Index: src/gpu/gl/builders/GrGLProgramBuilder.h
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h
index 5805cfc146661923e6c8ce2adfe566b6a18e48db..4cfe0286d8f0829f7f57b7b68bdb972e97a46be2 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.h
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.h
@@ -188,15 +188,8 @@ public:
*/
template <class Proc>
struct GrGLInstalledProc {
- typedef GrGLProgramDataManager::UniformHandle UniformHandle;
-
- struct Sampler {
- SkDEBUGCODE(Sampler() : fTextureUnit(-1) {})
- UniformHandle fUniform;
- int fTextureUnit;
- };
- SkSTArray<4, Sampler, true> fSamplers;
- SkAutoTDelete<Proc> fGLProc;
+ SkDEBUGCODE(int fSamplersIdx;)
+ SkAutoTDelete<Proc> fGLProc;
};
typedef GrGLInstalledProc<GrGLPrimitiveProcessor> GrGLInstalledGeoProc;
@@ -390,6 +383,7 @@ protected:
UniformInfoArray fUniforms;
GrGLPrimitiveProcessor::TransformsIn fCoordTransforms;
GrGLPrimitiveProcessor::TransformsOut fOutCoords;
+ SkTArray<UniformHandle> fSamplerUniforms;
friend class GrGLShaderBuilder;
friend class GrGLVertexBuilder;

Powered by Google App Engine
This is Rietveld 408576698