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>

gn/gpu.gni

diff --git a/gn/gpu.gni b/gn/gpu.gni
index e3b02b8..439443e 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -29,6 +29,7 @@
   "$_include/gpu/GrRenderTarget.h",
   "$_include/gpu/GrRenderTargetContext.h",
   "$_include/gpu/GrResourceKey.h",
+  "$_include/gpu/GrShaderCaps.h",
   "$_include/gpu/GrShaderVar.h",
   "$_include/gpu/GrSurface.h",
   "$_include/gpu/GrSurfaceContext.h",
@@ -57,10 +58,13 @@
 
   # Private includes
   "$_include/private/GrAuditTrail.h",
+  "$_include/private/GrGLSL.h",
+  "$_include/private/GrGLSL_impl.h",
   "$_include/private/GrInstancedPipelineInfo.h",
   "$_include/private/GrSingleOwner.h",
   "$_include/private/GrRenderTargetProxy.h",
   "$_include/private/GrSurfaceProxy.h",
+  "$_include/private/GrSwizzle.h",
   "$_include/private/GrTextureProxy.h",
   "$_include/private/GrTextureRenderTargetProxy.h",
   "$_include/private/GrTextureStripAtlas.h",
@@ -173,6 +177,7 @@
   "$_src/gpu/GrResourceProvider.cpp",
   "$_src/gpu/GrResourceProvider.h",
   "$_src/gpu/GrScissorState.h",
+  "$_src/gpu/GrShaderCaps.cpp",
   "$_src/gpu/GrShape.cpp",
   "$_src/gpu/GrShape.h",
   "$_src/gpu/GrStencilAttachment.cpp",
@@ -198,7 +203,6 @@
   "$_src/gpu/GrSurface.cpp",
   "$_src/gpu/GrSurfaceContext.cpp",
   "$_src/gpu/GrSurfaceProxy.cpp",
-  "$_src/gpu/GrSwizzle.h",
   "$_src/gpu/GrTexture.cpp",
   "$_src/gpu/GrTextureAdjuster.cpp",
   "$_src/gpu/GrTextureAdjuster.h",
@@ -413,12 +417,8 @@
 
   # GLSL
   "$_src/gpu/glsl/GrGLSL.cpp",
-  "$_src/gpu/glsl/GrGLSL.h",
-  "$_src/gpu/glsl/GrGLSL_impl.h",
   "$_src/gpu/glsl/GrGLSLBlend.cpp",
   "$_src/gpu/glsl/GrGLSLBlend.h",
-  "$_src/gpu/glsl/GrGLSLCaps.cpp",
-  "$_src/gpu/glsl/GrGLSLCaps.h",
   "$_src/gpu/glsl/GrGLSLColorSpaceXformHelper.h",
   "$_src/gpu/glsl/GrGLSLFragmentProcessor.cpp",
   "$_src/gpu/glsl/GrGLSLFragmentProcessor.h",