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

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

Issue 304383002: Make GrGLShaderBuilder store a GenProgramOutput (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Attempt to revert angle changes Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 SkAutoTDelete<GrGLProgramEffects> fCoverageEffects; 196 SkAutoTDelete<GrGLProgramEffects> fCoverageEffects;
197 197
198 GrGLProgramDesc fDesc; 198 GrGLProgramDesc fDesc;
199 199
200 GrGpuGL* fGpu; 200 GrGpuGL* fGpu;
201 201
202 SkAutoTUnref<GrGLUniformManager> fUniformManager; 202 SkAutoTUnref<GrGLUniformManager> fUniformManager;
203 GrGLShaderBuilder::UniformHandles fUniformHandles; 203 GrGLShaderBuilder::UniformHandles fUniformHandles;
204 204
205 bool fHasVertexShader; 205 bool fHasVertexShader;
206 int fNumTexCoordSets; 206 int fTexCoordSetCnt;
207 207
208 typedef SkRefCnt INHERITED; 208 typedef SkRefCnt INHERITED;
209 }; 209 };
210 210
211 #endif 211 #endif
OLDNEW
« no previous file with comments | « no previous file | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698