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

Side by Side Diff: src/gpu/gl/GrGLProgram.h

Issue 864853002: remove drawType from optState (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 8
9 #ifndef GrGLProgram_DEFINED 9 #ifndef GrGLProgram_DEFINED
10 #define GrGLProgram_DEFINED 10 #define GrGLProgram_DEFINED
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 } 88 }
89 } 89 }
90 }; 90 };
91 91
92 /** 92 /**
93 * This function uploads uniforms and calls each GrGLProcessor's setData. It is called before a 93 * This function uploads uniforms and calls each GrGLProcessor's setData. It is called before a
94 * draw occurs using the program after the program has already been bound. I t also uses the 94 * draw occurs using the program after the program has already been bound. I t also uses the
95 * GrGLGpu object to bind the textures required by the GrGLProcessors. The c olor and coverage 95 * GrGLGpu object to bind the textures required by the GrGLProcessors. The c olor and coverage
96 * stages come from GrGLProgramDesc::Build(). 96 * stages come from GrGLProgramDesc::Build().
97 */ 97 */
98 void setData(const GrPrimitiveProcessor&, const GrOptDrawState&, const GrBat chTracker&); 98 void setData(const GrPrimitiveProcessor&, const GrOptDrawState&, const GrBat chTracker&,
99 GrGpu::DrawType);
99 100
100 protected: 101 protected:
101 typedef GrGLProgramDataManager::UniformHandle UniformHandle; 102 typedef GrGLProgramDataManager::UniformHandle UniformHandle;
102 typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray; 103 typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
103 104
104 GrGLProgram(GrGLGpu*, 105 GrGLProgram(GrGLGpu*,
105 const GrProgramDesc&, 106 const GrProgramDesc&,
106 const BuiltinUniformHandles&, 107 const BuiltinUniformHandles&,
107 GrGLuint programID, 108 GrGLuint programID,
108 const UniformInfoArray&, 109 const UniformInfoArray&,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 int index, 182 int index,
182 GrGLInstalledFragProc*) SK_OVERRIDE; 183 GrGLInstalledFragProc*) SK_OVERRIDE;
183 virtual void onSetRenderTargetState(const GrPrimitiveProcessor&, const GrOpt DrawState&); 184 virtual void onSetRenderTargetState(const GrPrimitiveProcessor&, const GrOpt DrawState&);
184 185
185 friend class GrGLNvprProgramBuilder; 186 friend class GrGLNvprProgramBuilder;
186 187
187 typedef GrGLProgram INHERITED; 188 typedef GrGLProgram INHERITED;
188 }; 189 };
189 190
190 #endif 191 #endif
OLDNEW
« src/gpu/gl/GrGLGpu.cpp ('K') | « src/gpu/gl/GrGLGpu.cpp ('k') | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698