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

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

Issue 1307223004: Remove GrStagedProcessor, remove the word Stage as it applies to FPs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix misresolve Created 5 years, 3 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 | « src/gpu/gl/GrGLPathProgram.cpp ('k') | 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 const UniformInfoArray&, 108 const UniformInfoArray&,
109 GrGLInstalledGeoProc* geometryProcessor, 109 GrGLInstalledGeoProc* geometryProcessor,
110 GrGLInstalledXferProc* xferProcessor, 110 GrGLInstalledXferProc* xferProcessor,
111 GrGLInstalledFragProcs* fragmentProcessors, 111 GrGLInstalledFragProcs* fragmentProcessors,
112 SkTArray<UniformHandle>* passSamplerUniforms); 112 SkTArray<UniformHandle>* passSamplerUniforms);
113 113
114 // A templated helper to loop over effects, set the transforms(via subclass) and bind textures 114 // A templated helper to loop over effects, set the transforms(via subclass) and bind textures
115 void setFragmentData(const GrPrimitiveProcessor&, const GrPipeline&, 115 void setFragmentData(const GrPrimitiveProcessor&, const GrPipeline&,
116 SkTArray<const GrTextureAccess*>* textureBindings); 116 SkTArray<const GrTextureAccess*>* textureBindings);
117 virtual void setTransformData(const GrPrimitiveProcessor&, 117 virtual void setTransformData(const GrPrimitiveProcessor&,
118 const GrPendingFragmentStage&, 118 const GrFragmentProcessor&,
119 int index, 119 int index,
120 GrGLInstalledFragProc*); 120 GrGLInstalledFragProc*);
121 121
122 /* 122 /*
123 * Legacy NVPR needs a hook here to flush path tex gen settings. 123 * Legacy NVPR needs a hook here to flush path tex gen settings.
124 * TODO when legacy nvpr is removed, remove this call. 124 * TODO when legacy nvpr is removed, remove this call.
125 */ 125 */
126 virtual void didSetData() {} 126 virtual void didSetData() {}
127 127
128 // Helper for setData() that sets the view matrix and loads the render targe t height uniform 128 // Helper for setData() that sets the view matrix and loads the render targe t height uniform
(...skipping 17 matching lines...) Expand all
146 GrGLGpu* fGpu; 146 GrGLGpu* fGpu;
147 GrGLProgramDataManager fProgramDataManager; 147 GrGLProgramDataManager fProgramDataManager;
148 SkTArray<UniformHandle> fSamplerUniforms; 148 SkTArray<UniformHandle> fSamplerUniforms;
149 149
150 friend class GrGLProgramBuilder; 150 friend class GrGLProgramBuilder;
151 151
152 typedef SkRefCnt INHERITED; 152 typedef SkRefCnt INHERITED;
153 }; 153 };
154 154
155 #endif 155 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLPathProgram.cpp ('k') | src/gpu/gl/GrGLProgram.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698