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

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

Issue 543623004: Removing vertex attrib indices (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: warning fixed Created 6 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/GrGLGeometryProcessor.h ('k') | src/gpu/gl/GrGLProgramEffects.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 2013 Google Inc. 2 * Copyright 2013 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 #ifndef GrGLProgramEffects_DEFINED 8 #ifndef GrGLProgramEffects_DEFINED
9 #define GrGLProgramEffects_DEFINED 9 #define GrGLProgramEffects_DEFINED
10 10
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 char fSwizzle[5]; 107 char fSwizzle[5];
108 }; 108 };
109 109
110 typedef SkTArray<TextureSampler> TextureSamplerArray; 110 typedef SkTArray<TextureSampler> TextureSamplerArray;
111 111
112 protected: 112 protected:
113 113
114 /** 114 /**
115 * Helpers for GenEffectMetaKey. 115 * Helpers for GenEffectMetaKey.
116 */ 116 */
117 static uint32_t GenAttribKey(const GrDrawEffect&); 117 static uint32_t GenAttribKey(const GrEffect&);
118 static uint32_t GenTransformKey(const GrDrawEffect&); 118 static uint32_t GenTransformKey(const GrDrawEffect&);
119 static uint32_t GenTextureKey(const GrDrawEffect&, const GrGLCaps&); 119 static uint32_t GenTextureKey(const GrDrawEffect&, const GrGLCaps&);
120 120
121 GrGLProgramEffects(int reserveCount) 121 GrGLProgramEffects(int reserveCount)
122 : fGLEffects(reserveCount) 122 : fGLEffects(reserveCount)
123 , fSamplers(reserveCount) { 123 , fSamplers(reserveCount) {
124 } 124 }
125 125
126 /** 126 /**
127 * Helper for emitEffect() in a subclasses. Emits uniforms for an effect's t exture accesses and 127 * Helper for emitEffect() in a subclasses. Emits uniforms for an effect's t exture accesses and
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 */ 346 */
347 GrGLProgramEffects* finish() { return fProgramEffects.detach(); } 347 GrGLProgramEffects* finish() { return fProgramEffects.detach(); }
348 private: 348 private:
349 GrGLFragmentOnlyProgramBuilder* fBuilder; 349 GrGLFragmentOnlyProgramBuilder* fBuilder;
350 SkAutoTDelete<GrGLPathTexGenProgramEffects> fProgramEffects; 350 SkAutoTDelete<GrGLPathTexGenProgramEffects> fProgramEffects;
351 typedef GrGLProgramEffectsBuilder INHERITED; 351 typedef GrGLProgramEffectsBuilder INHERITED;
352 }; 352 };
353 353
354 354
355 #endif 355 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLGeometryProcessor.h ('k') | src/gpu/gl/GrGLProgramEffects.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698