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

Side by Side Diff: src/effects/SkColorFilters.cpp

Issue 365853002: Rename GrGLUniformManager to GrGLProgramResourceManager (Closed) Base URL: https://skia.googlesource.com/skia.git@02-path-program-fragment
Patch Set: rebase Created 6 years, 4 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/effects/SkBlurMaskFilter.cpp ('k') | src/effects/SkColorMatrixFilter.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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 #include "SkBlitRow.h" 8 #include "SkBlitRow.h"
9 #include "SkColorFilter.h" 9 #include "SkColorFilter.h"
10 #include "SkColorPriv.h" 10 #include "SkColorPriv.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 } 250 }
251 251
252 static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, 252 static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&,
253 GrEffectKeyBuilder* b) { 253 GrEffectKeyBuilder* b) {
254 const ModeColorFilterEffect& colorModeFilter = drawEffect.castEffect <ModeColorFilterEffect>(); 254 const ModeColorFilterEffect& colorModeFilter = drawEffect.castEffect <ModeColorFilterEffect>();
255 // The SL code does not depend on filter color at the moment, so no need to represent it 255 // The SL code does not depend on filter color at the moment, so no need to represent it
256 // in the key. 256 // in the key.
257 b->add32(colorModeFilter.mode()); 257 b->add32(colorModeFilter.mode());
258 } 258 }
259 259
260 virtual void setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) SK_OVERRIDE { 260 virtual void setData(const GrGLProgramDataManager& pdman, const GrDrawEf fect& drawEffect) SK_OVERRIDE {
261 if (fFilterColorUni.isValid()) { 261 if (fFilterColorUni.isValid()) {
262 const ModeColorFilterEffect& colorModeFilter = drawEffect.castEf fect<ModeColorFilterEffect>(); 262 const ModeColorFilterEffect& colorModeFilter = drawEffect.castEf fect<ModeColorFilterEffect>();
263 GrGLfloat c[4]; 263 GrGLfloat c[4];
264 GrColorToRGBAFloat(colorModeFilter.color(), c); 264 GrColorToRGBAFloat(colorModeFilter.color(), c);
265 uman.set4fv(fFilterColorUni, 1, c); 265 pdman.set4fv(fFilterColorUni, 1, c);
266 } 266 }
267 } 267 }
268 268
269 private: 269 private:
270 270
271 GrGLUniformManager::UniformHandle fFilterColorUni; 271 GrGLProgramDataManager::UniformHandle fFilterColorUni;
272 typedef GrGLEffect INHERITED; 272 typedef GrGLEffect INHERITED;
273 }; 273 };
274 274
275 GR_DECLARE_EFFECT_TEST; 275 GR_DECLARE_EFFECT_TEST;
276 276
277 private: 277 private:
278 ModeColorFilterEffect(GrColor color, SkXfermode::Mode mode) 278 ModeColorFilterEffect(GrColor color, SkXfermode::Mode mode)
279 : fMode(mode), 279 : fMode(mode),
280 fColor(color) { 280 fColor(color) {
281 281
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 SkIntToScalar(SkColorGetB(add)), 558 SkIntToScalar(SkColorGetB(add)),
559 0); 559 0);
560 return SkColorMatrixFilter::Create(matrix); 560 return SkColorMatrixFilter::Create(matrix);
561 } 561 }
562 562
563 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter) 563 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter)
564 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter) 564 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter)
565 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Src_SkModeColorFilter) 565 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Src_SkModeColorFilter)
566 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SrcOver_SkModeColorFilter) 566 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SrcOver_SkModeColorFilter)
567 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 567 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
OLDNEW
« no previous file with comments | « src/effects/SkBlurMaskFilter.cpp ('k') | src/effects/SkColorMatrixFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698