From 7fbb7d3d907691adb0e7b269eca7db6756e7fd7e Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 24 Apr 2017 08:13:59 -0400 Subject: [PATCH] Remove two more gpu headers from include/* This is probably it until GrTexture.h can be hidden. TBR=bsalomon@google.com Change-Id: Ie743c937f72aa0dc9f5e84def572f655f0abe041 Reviewed-on: https://skia-review.googlesource.com/14143 Reviewed-by: Brian Osman Commit-Queue: Robert Phillips --- gn/gpu.gni | 4 ++-- include/gpu/GrCaps.h | 1 - {include => src}/gpu/GrShaderVar.h | 0 {include/private => src/gpu}/GrTextureRenderTargetProxy.h | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename {include => src}/gpu/GrShaderVar.h (100%) rename {include/private => src/gpu}/GrTextureRenderTargetProxy.h (100%) diff --git a/gn/gpu.gni b/gn/gpu.gni index 6bc2908..b3e78fd 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -21,7 +21,6 @@ skia_gpu_sources = [ "$_include/gpu/GrRenderTarget.h", "$_include/gpu/GrResourceKey.h", "$_include/gpu/GrShaderCaps.h", - "$_include/gpu/GrShaderVar.h", "$_include/gpu/GrSurface.h", "$_include/gpu/GrTexture.h", "$_include/gpu/GrSamplerParams.h", @@ -46,7 +45,6 @@ skia_gpu_sources = [ "$_include/private/GrSurfaceProxy.h", "$_include/private/GrSwizzle.h", "$_include/private/GrTextureProxy.h", - "$_include/private/GrTextureRenderTargetProxy.h", "$_src/gpu/GrAppliedClip.h", "$_src/gpu/GrAuditTrail.cpp", @@ -190,6 +188,7 @@ skia_gpu_sources = [ "$_src/gpu/GrTestUtils.cpp", "$_src/gpu/GrTestUtils.h", "$_src/gpu/GrShaderVar.cpp", + "$_src/gpu/GrShaderVar.h", "$_src/gpu/GrSWMaskHelper.cpp", "$_src/gpu/GrSWMaskHelper.h", "$_src/gpu/GrSoftwarePathRenderer.cpp", @@ -211,6 +210,7 @@ skia_gpu_sources = [ "$_src/gpu/GrTextureProducer.h", "$_src/gpu/GrTextureProxy.cpp", "$_src/gpu/GrTextureRenderTargetProxy.cpp", + "$_src/gpu/GrTextureRenderTargetProxy.h", "$_src/gpu/GrTextureStripAtlas.h", "$_src/gpu/GrTextureToYUVPlanes.cpp", "$_src/gpu/GrTextureToYUVPlanes.h", diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h index 0d05d47..8b00580 100644 --- a/include/gpu/GrCaps.h +++ b/include/gpu/GrCaps.h @@ -11,7 +11,6 @@ #include "GrTypes.h" #include "GrTypesPriv.h" #include "GrBlend.h" -#include "GrShaderVar.h" #include "GrShaderCaps.h" #include "SkRefCnt.h" #include "SkString.h" diff --git a/include/gpu/GrShaderVar.h b/src/gpu/GrShaderVar.h similarity index 100% rename from include/gpu/GrShaderVar.h rename to src/gpu/GrShaderVar.h diff --git a/include/private/GrTextureRenderTargetProxy.h b/src/gpu/GrTextureRenderTargetProxy.h similarity index 100% rename from include/private/GrTextureRenderTargetProxy.h rename to src/gpu/GrTextureRenderTargetProxy.h -- 2.7.4