commit 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108
author Brian Salomon <bsalomon@google.com> Tue Nov 29 13:43:05 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Nov 29 19:32:31 2016 +0000
tree 2723f6ec5bfc291d4a52adf961165e3e74a098ca
parent e11b614795bbe707d131ad599ead5be452e7c06f

Merge GrGLSLCaps into GrShaderCaps

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

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

include/gpu/GrShaderVar.h

diff --git a/include/gpu/GrShaderVar.h b/include/gpu/GrShaderVar.h
index 1149f84..7f09f8c 100644
--- a/include/gpu/GrShaderVar.h
+++ b/include/gpu/GrShaderVar.h
@@ -11,7 +11,7 @@
 #include "SkString.h"
 #include "GrTypesPriv.h"
 
-class GrGLSLCaps;
+class GrShaderCaps;
 
 #define USE_UNIFORM_FLOAT_ARRAYS true
 
@@ -301,7 +301,7 @@
     /**
      * Write a declaration of this variable to out.
      */
-    void appendDecl(const GrGLSLCaps* glslCaps, SkString* out) const;
+    void appendDecl(const GrShaderCaps*, SkString* out) const;
 
     void appendArrayAccess(int index, SkString* out) const {
         out->appendf("%s[%d]%s",
@@ -331,4 +331,4 @@
     SkString        fExtraModifiers;
 };
 
- #endif
+#endif