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

Side by Side Diff: src/gpu/effects/GrConfigConversionEffect.cpp

Issue 1862373003: Rename EmitArgs::fSamplers to fTexSamplers (Closed) Base URL: https://skia.googlesource.com/skia.git@upload3_infer
Patch Set: rebase Created 4 years, 8 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/effects/GrBitmapTextGeoProc.cpp ('k') | src/gpu/effects/GrConvolutionEffect.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 2012 Google Inc. 2 * Copyright 2012 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 #include "GrConfigConversionEffect.h" 8 #include "GrConfigConversionEffect.h"
9 #include "GrContext.h" 9 #include "GrContext.h"
10 #include "GrDrawContext.h" 10 #include "GrDrawContext.h"
(...skipping 13 matching lines...) Expand all
24 // Using highp for GLES here in order to avoid some precision issues on specific GPUs. 24 // Using highp for GLES here in order to avoid some precision issues on specific GPUs.
25 GrGLSLShaderVar tmpVar("tmpColor", kVec4f_GrSLType, 0, kHigh_GrSLPrecisi on); 25 GrGLSLShaderVar tmpVar("tmpColor", kVec4f_GrSLType, 0, kHigh_GrSLPrecisi on);
26 SkString tmpDecl; 26 SkString tmpDecl;
27 tmpVar.appendDecl(args.fGLSLCaps, &tmpDecl); 27 tmpVar.appendDecl(args.fGLSLCaps, &tmpDecl);
28 28
29 GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder; 29 GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
30 30
31 fragBuilder->codeAppendf("%s;", tmpDecl.c_str()); 31 fragBuilder->codeAppendf("%s;", tmpDecl.c_str());
32 32
33 fragBuilder->codeAppendf("%s = ", tmpVar.c_str()); 33 fragBuilder->codeAppendf("%s = ", tmpVar.c_str());
34 fragBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_st r(), 34 fragBuilder->appendTextureLookup(args.fTexSamplers[0], args.fCoords[0].c _str(),
35 args.fCoords[0].getType()); 35 args.fCoords[0].getType());
36 fragBuilder->codeAppend(";"); 36 fragBuilder->codeAppend(";");
37 37
38 if (GrConfigConversionEffect::kNone_PMConversion == pmConversion) { 38 if (GrConfigConversionEffect::kNone_PMConversion == pmConversion) {
39 SkASSERT(GrSwizzle::RGBA() != swizzle); 39 SkASSERT(GrSwizzle::RGBA() != swizzle);
40 fragBuilder->codeAppendf("%s = %s.%s;", args.fOutputColor, tmpVar.c_ str(), 40 fragBuilder->codeAppendf("%s = %s.%s;", args.fOutputColor, tmpVar.c_ str(),
41 swizzle.c_str()); 41 swizzle.c_str());
42 } else { 42 } else {
43 switch (pmConversion) { 43 switch (pmConversion) {
44 case GrConfigConversionEffect::kMulByAlpha_RoundUp_PMConversion: 44 case GrConfigConversionEffect::kMulByAlpha_RoundUp_PMConversion:
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 } else { 301 } else {
302 if (kRGBA_8888_GrPixelConfig != texture->config() && 302 if (kRGBA_8888_GrPixelConfig != texture->config() &&
303 kBGRA_8888_GrPixelConfig != texture->config() && 303 kBGRA_8888_GrPixelConfig != texture->config() &&
304 kNone_PMConversion != pmConversion) { 304 kNone_PMConversion != pmConversion) {
305 // The PM conversions assume colors are 0..255 305 // The PM conversions assume colors are 0..255
306 return nullptr; 306 return nullptr;
307 } 307 }
308 return new GrConfigConversionEffect(texture, swizzle, pmConversion, matr ix); 308 return new GrConfigConversionEffect(texture, swizzle, pmConversion, matr ix);
309 } 309 }
310 } 310 }
OLDNEW
« no previous file with comments | « src/gpu/effects/GrBitmapTextGeoProc.cpp ('k') | src/gpu/effects/GrConvolutionEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698