| commit | 99938a8ef24e2dd5b39f78638742e9b50ab6d9bf | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
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>
diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h index bf8569c..f7d2323 100644 --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h +++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h
@@ -8,8 +8,8 @@ #ifndef GrGLSLFragmentShaderBuilder_DEFINED #define GrGLSLFragmentShaderBuilder_DEFINED +#include "GrBlend.h" #include "GrGLSLShaderBuilder.h" - #include "GrProcessor.h" class GrRenderTarget;