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

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

Issue 788733003: Make addUniform take a precision (Closed) Base URL: https://skia.googlesource.com/skia.git@move_prec
Patch Set: rebase Created 6 years 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/SkColorCubeFilter.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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 const char* outputColor, 218 const char* outputColor,
219 const char* inputColor, 219 const char* inputColor,
220 const TransformedCoordsArray&, 220 const TransformedCoordsArray&,
221 const TextureSamplerArray&) SK_OVERRIDE { 221 const TextureSamplerArray&) SK_OVERRIDE {
222 SkXfermode::Mode mode = fp.cast<ModeColorFilterEffect>().mode(); 222 SkXfermode::Mode mode = fp.cast<ModeColorFilterEffect>().mode();
223 223
224 SkASSERT(SkXfermode::kDst_Mode != mode); 224 SkASSERT(SkXfermode::kDst_Mode != mode);
225 const char* colorFilterColorUniName = NULL; 225 const char* colorFilterColorUniName = NULL;
226 if (fp.cast<ModeColorFilterEffect>().willUseFilterColor()) { 226 if (fp.cast<ModeColorFilterEffect>().willUseFilterColor()) {
227 fFilterColorUni = builder->addUniform(GrGLProgramBuilder::kFragm ent_Visibility, 227 fFilterColorUni = builder->addUniform(GrGLProgramBuilder::kFragm ent_Visibility,
228 kVec4f_GrSLType, "FilterCo lor", 228 kVec4f_GrSLType, kDefault_ GrSLPrecision,
229 "FilterColor",
229 &colorFilterColorUniName); 230 &colorFilterColorUniName);
230 } 231 }
231 232
232 GrGLSLExpr4 filter = 233 GrGLSLExpr4 filter =
233 color_filter_expression(mode, GrGLSLExpr4(colorFilterColorUniNam e), 234 color_filter_expression(mode, GrGLSLExpr4(colorFilterColorUniNam e),
234 GrGLSLExpr4(inputColor)); 235 GrGLSLExpr4(inputColor));
235 236
236 builder->getFragmentShaderBuilder()-> 237 builder->getFragmentShaderBuilder()->
237 codeAppendf("\t%s = %s;\n", outputColor, filter.c_str()); 238 codeAppendf("\t%s = %s;\n", outputColor, filter.c_str());
238 } 239 }
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 matrix.postTranslate(SkIntToScalar(SkColorGetR(add)), 545 matrix.postTranslate(SkIntToScalar(SkColorGetR(add)),
545 SkIntToScalar(SkColorGetG(add)), 546 SkIntToScalar(SkColorGetG(add)),
546 SkIntToScalar(SkColorGetB(add)), 547 SkIntToScalar(SkColorGetB(add)),
547 0); 548 0);
548 return SkColorMatrixFilter::Create(matrix); 549 return SkColorMatrixFilter::Create(matrix);
549 } 550 }
550 551
551 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter) 552 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter)
552 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter) 553 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter)
553 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 554 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
OLDNEW
« no previous file with comments | « src/effects/SkColorCubeFilter.cpp ('k') | src/effects/SkColorMatrixFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698