commit 99938a8ef24e2dd5b39f78638742e9b50ab6d9bf
author Brian Salomon <bsalomon@google.com> Mon Nov 21 13:41:08 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Nov 21 19:13:43 2016 +0000
tree e3842210db20a4574e9cec37ae7f049aaff27b65
parent d728f0c1a94fe926b59d8ebc9ae174019ccd3606

Merge GrGLSLShaderVar and GrShaderVar

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5087

Change-Id: Ib8943a1da1ea495554feaf5b0992b94fbb9539ab
Reviewed-on: https://skia-review.googlesource.com/5087
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>

src/gpu/effects/GrConvolutionEffect.cpp

diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp
index 05e9deb..fbca646 100644
--- a/src/gpu/effects/GrConvolutionEffect.cpp
+++ b/src/gpu/effects/GrConvolutionEffect.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "GrConvolutionEffect.h"
+#include "glsl/GrGLSL.h"
 #include "glsl/GrGLSLFragmentProcessor.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"
 #include "glsl/GrGLSLProgramDataManager.h"
@@ -58,7 +59,7 @@
 
     fragBuilder->codeAppendf("%s = vec4(0, 0, 0, 0);", args.fOutputColor);
 
-    const GrGLSLShaderVar& kernel = uniformHandler->getUniformVariable(fKernelUni);
+    const GrShaderVar& kernel = uniformHandler->getUniformVariable(fKernelUni);
     const char* imgInc = uniformHandler->getUniformCStr(fImageIncrementUni);
 
     fragBuilder->codeAppendf("vec2 coord = %s - %d.0 * %s;", coords2D.c_str(), ce.radius(), imgInc);