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

Unified Diff: src/effects/SkPerlinNoiseShader.cpp

Issue 1417123002: Move GrGLShaderVar to GrGLSL (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix gyp Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/effects/SkLightingImageFilter.cpp ('k') | src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkPerlinNoiseShader.cpp
diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp
index 481d1607f704c358124502e3d39058067c5cd8a2..0a3341a9b14a23bf359762d5aebdf607255dca97 100644
--- a/src/effects/SkPerlinNoiseShader.cpp
+++ b/src/effects/SkPerlinNoiseShader.cpp
@@ -658,15 +658,15 @@ void GrGLPerlinNoise::emitCode(EmitArgs& args) {
const char* dotLattice = "dot(((%s.ga + %s.rb * vec2(%s)) * vec2(2.0) - vec2(1.0)), %s);";
// Add noise function
- static const GrGLShaderVar gPerlinNoiseArgs[] = {
- GrGLShaderVar(chanCoord, kFloat_GrSLType),
- GrGLShaderVar(noiseVec, kVec2f_GrSLType)
+ static const GrGLSLShaderVar gPerlinNoiseArgs[] = {
+ GrGLSLShaderVar(chanCoord, kFloat_GrSLType),
+ GrGLSLShaderVar(noiseVec, kVec2f_GrSLType)
};
- static const GrGLShaderVar gPerlinNoiseStitchArgs[] = {
- GrGLShaderVar(chanCoord, kFloat_GrSLType),
- GrGLShaderVar(noiseVec, kVec2f_GrSLType),
- GrGLShaderVar(stitchData, kVec2f_GrSLType)
+ static const GrGLSLShaderVar gPerlinNoiseStitchArgs[] = {
+ GrGLSLShaderVar(chanCoord, kFloat_GrSLType),
+ GrGLSLShaderVar(noiseVec, kVec2f_GrSLType),
+ GrGLSLShaderVar(stitchData, kVec2f_GrSLType)
};
SkString noiseCode;
« no previous file with comments | « src/effects/SkLightingImageFilter.cpp ('k') | src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698