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

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

Issue 2324663004: Remove unneeded GrGLSLTransformedCoordsArray type (Closed)
Patch Set: update comments Created 4 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/effects/GrConvolutionEffect.cpp ('k') | src/gpu/effects/GrSimpleTextureEffect.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 2014 Google Inc. 2 * Copyright 2014 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 #include "GrMatrixConvolutionEffect.h" 7 #include "GrMatrixConvolutionEffect.h"
8 #include "glsl/GrGLSLFragmentProcessor.h" 8 #include "glsl/GrGLSLFragmentProcessor.h"
9 #include "glsl/GrGLSLFragmentShaderBuilder.h" 9 #include "glsl/GrGLSLFragmentShaderBuilder.h"
10 #include "glsl/GrGLSLProgramDataManager.h" 10 #include "glsl/GrGLSLProgramDataManager.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 fBiasUni = uniformHandler->addUniform(kFragment_GrShaderFlag, 58 fBiasUni = uniformHandler->addUniform(kFragment_GrShaderFlag,
59 kFloat_GrSLType, kDefault_GrSLPrecisio n, "Bias"); 59 kFloat_GrSLType, kDefault_GrSLPrecisio n, "Bias");
60 60
61 const char* kernelOffset = uniformHandler->getUniformCStr(fKernelOffsetUni); 61 const char* kernelOffset = uniformHandler->getUniformCStr(fKernelOffsetUni);
62 const char* imgInc = uniformHandler->getUniformCStr(fImageIncrementUni); 62 const char* imgInc = uniformHandler->getUniformCStr(fImageIncrementUni);
63 const char* kernel = uniformHandler->getUniformCStr(fKernelUni); 63 const char* kernel = uniformHandler->getUniformCStr(fKernelUni);
64 const char* gain = uniformHandler->getUniformCStr(fGainUni); 64 const char* gain = uniformHandler->getUniformCStr(fGainUni);
65 const char* bias = uniformHandler->getUniformCStr(fBiasUni); 65 const char* bias = uniformHandler->getUniformCStr(fBiasUni);
66 66
67 GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder; 67 GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
68 SkString coords2D = fragBuilder->ensureFSCoords2D(args.fCoords, 0); 68 SkString coords2D = fragBuilder->ensureCoords2D(args.fTransformedCoords[0]);
69 fragBuilder->codeAppend("vec4 sum = vec4(0, 0, 0, 0);"); 69 fragBuilder->codeAppend("vec4 sum = vec4(0, 0, 0, 0);");
70 fragBuilder->codeAppendf("vec2 coord = %s - %s * %s;", coords2D.c_str(), ker nelOffset, imgInc); 70 fragBuilder->codeAppendf("vec2 coord = %s - %s * %s;", coords2D.c_str(), ker nelOffset, imgInc);
71 fragBuilder->codeAppend("vec4 c;"); 71 fragBuilder->codeAppend("vec4 c;");
72 72
73 const char* kVecSuffix[4] = { ".x", ".y", ".z", ".w" }; 73 const char* kVecSuffix[4] = { ".x", ".y", ".z", ".w" };
74 for (int y = 0; y < kHeight; y++) { 74 for (int y = 0; y < kHeight; y++) {
75 for (int x = 0; x < kWidth; x++) { 75 for (int x = 0; x < kWidth; x++) {
76 GrGLSLShaderBuilder::ShaderBlock block(fragBuilder); 76 GrGLSLShaderBuilder::ShaderBlock block(fragBuilder);
77 int offset = y*kWidth + x; 77 int offset = y*kWidth + x;
78 78
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 return GrMatrixConvolutionEffect::Make(d->fTextures[texIdx], 259 return GrMatrixConvolutionEffect::Make(d->fTextures[texIdx],
260 bounds, 260 bounds,
261 kernelSize, 261 kernelSize,
262 kernel.get(), 262 kernel.get(),
263 gain, 263 gain,
264 bias, 264 bias,
265 kernelOffset, 265 kernelOffset,
266 tileMode, 266 tileMode,
267 convolveAlpha); 267 convolveAlpha);
268 } 268 }
OLDNEW
« no previous file with comments | « src/gpu/effects/GrConvolutionEffect.cpp ('k') | src/gpu/effects/GrSimpleTextureEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698