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

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

Issue 1416523003: Remove unused member variables in GrGLProgram (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 2 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
« 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 void setTransformData(const GrPrimitiveProcessor&, 118 void setTransformData(const GrPrimitiveProcessor&,
119 const GrFragmentProcessor&, 119 const GrFragmentProcessor&,
120 int index, 120 int index,
121 GrGLInstalledFragProc*); 121 GrGLInstalledFragProc*);
122 122
123 // Helper for setData() that sets the view matrix and loads the render targe t height uniform 123 // Helper for setData() that sets the view matrix and loads the render targe t height uniform
124 void setRenderTargetState(const GrPrimitiveProcessor&, const GrPipeline&); 124 void setRenderTargetState(const GrPrimitiveProcessor&, const GrPipeline&);
125 125
126 // these reflect the current values of uniforms (GL uniform values travel wi th program) 126 // these reflect the current values of uniforms (GL uniform values travel wi th program)
127 RenderTargetState fRenderTargetState; 127 RenderTargetState fRenderTargetState;
128 GrColor fColor;
129 uint8_t fCoverage;
130 int fDstTextureUnit;
131 BuiltinUniformHandles fBuiltinUniformHandles; 128 BuiltinUniformHandles fBuiltinUniformHandles;
132 GrGLuint fProgramID; 129 GrGLuint fProgramID;
133 130
134 // the installed effects 131 // the installed effects
135 SkAutoTDelete<GrGLInstalledGeoProc> fGeometryProcessor; 132 SkAutoTDelete<GrGLInstalledGeoProc> fGeometryProcessor;
136 SkAutoTDelete<GrGLInstalledXferProc> fXferProcessor; 133 SkAutoTDelete<GrGLInstalledXferProc> fXferProcessor;
137 SkAutoTUnref<GrGLInstalledFragProcs> fFragmentProcessors; 134 SkAutoTUnref<GrGLInstalledFragProcs> fFragmentProcessors;
138 135
139 GrProgramDesc fDesc; 136 GrProgramDesc fDesc;
140 GrGLGpu* fGpu; 137 GrGLGpu* fGpu;
141 GrGLProgramDataManager fProgramDataManager; 138 GrGLProgramDataManager fProgramDataManager;
142 SkTArray<UniformHandle> fSamplerUniforms; 139 SkTArray<UniformHandle> fSamplerUniforms;
143 140
144 friend class GrGLProgramBuilder; 141 friend class GrGLProgramBuilder;
145 142
146 typedef SkRefCnt INHERITED; 143 typedef SkRefCnt INHERITED;
147 }; 144 };
148 145
149 #endif 146 #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