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

Side by Side Diff: src/core/SkLightingShader.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 | « gyp/gpu.gypi ('k') | src/effects/GrCircleBlurFragmentProcessor.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 2015 Google Inc. 2 * Copyright 2015 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 "SkBitmapProcState.h" 8 #include "SkBitmapProcState.h"
9 #include "SkColor.h" 9 #include "SkColor.h"
10 #include "SkEmptyShader.h" 10 #include "SkEmptyShader.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 fAmbientColorUni = uniformHandler->addUniform(kFragment_GrShaderFlag , 196 fAmbientColorUni = uniformHandler->addUniform(kFragment_GrShaderFlag ,
197 kVec3f_GrSLType, kDefa ult_GrSLPrecision, 197 kVec3f_GrSLType, kDefa ult_GrSLPrecision,
198 "AmbientColor", &ambie ntColorUniName); 198 "AmbientColor", &ambie ntColorUniName);
199 199
200 const char* xformUniName = nullptr; 200 const char* xformUniName = nullptr;
201 fXformUni = uniformHandler->addUniform(kFragment_GrShaderFlag, 201 fXformUni = uniformHandler->addUniform(kFragment_GrShaderFlag,
202 kVec2f_GrSLType, kDefault_GrS LPrecision, 202 kVec2f_GrSLType, kDefault_GrS LPrecision,
203 "Xform", &xformUniName); 203 "Xform", &xformUniName);
204 204
205 fragBuilder->codeAppend("vec4 diffuseColor = "); 205 fragBuilder->codeAppend("vec4 diffuseColor = ");
206 fragBuilder->appendTextureLookupAndModulate(args.fInputColor, args.f Samplers[0], 206 fragBuilder->appendTextureLookupAndModulate(args.fInputColor, args.f TexSamplers[0],
207 args.fCoords[0].c_str(), 207 args.fCoords[0].c_str(),
208 args.fCoords[0].getType()); 208 args.fCoords[0].getType());
209 fragBuilder->codeAppend(";"); 209 fragBuilder->codeAppend(";");
210 210
211 fragBuilder->codeAppend("vec4 normalColor = "); 211 fragBuilder->codeAppend("vec4 normalColor = ");
212 fragBuilder->appendTextureLookup(args.fSamplers[1], 212 fragBuilder->appendTextureLookup(args.fTexSamplers[1],
213 args.fCoords[1].c_str(), 213 args.fCoords[1].c_str(),
214 args.fCoords[1].getType()); 214 args.fCoords[1].getType());
215 fragBuilder->codeAppend(";"); 215 fragBuilder->codeAppend(";");
216 216
217 fragBuilder->codeAppend("vec3 normal = normalColor.rgb - vec3(0.5);" ); 217 fragBuilder->codeAppend("vec3 normal = normalColor.rgb - vec3(0.5);" );
218 218
219 fragBuilder->codeAppendf( 219 fragBuilder->codeAppendf(
220 "mat3 m = mat3(%s.x, -%s.y, 0.0, %s.y, %s.x, 0. 0, 0.0, 0.0, 1.0);", 220 "mat3 m = mat3(%s.x, -%s.y, 0.0, %s.y, %s.x, 0. 0, 0.0, 0.0, 1.0);",
221 xformUniName, xformUniName, xformUniName, xform UniName); 221 xformUniName, xformUniName, xformUniName, xform UniName);
222 222
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 normLocalM); 722 normLocalM);
723 } 723 }
724 724
725 /////////////////////////////////////////////////////////////////////////////// 725 ///////////////////////////////////////////////////////////////////////////////
726 726
727 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkLightingShader) 727 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkLightingShader)
728 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingShaderImpl) 728 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingShaderImpl)
729 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 729 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
730 730
731 /////////////////////////////////////////////////////////////////////////////// 731 ///////////////////////////////////////////////////////////////////////////////
OLDNEW
« no previous file with comments | « gyp/gpu.gypi ('k') | src/effects/GrCircleBlurFragmentProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698