Remove more headers from include/gpu

TBR=bsalomon@google.com

Change-Id: I93b28cfcb4d7b50c12e24ea81faab680bccce9ef
Reviewed-on: https://skia-review.googlesource.com/14036
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

diff --git a/gn/gpu.gni b/gn/gpu.gni
index 88e9339..fc2c532 100644 (file)
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -10,20 +10,13 @@ _include = get_path_info("../include", "abspath")
 skia_gpu_sources = [
   "$_include/gpu/GrBackendSurface.h",
   "$_include/gpu/GrBlend.h",
-  "$_include/gpu/GrBuffer.h",
   "$_include/gpu/GrCaps.h",
   "$_include/gpu/GrColor.h",
-  "$_include/gpu/GrColorSpaceXform.h",
   "$_include/gpu/GrConfig.h",
   "$_include/gpu/GrContextOptions.h",
   "$_include/gpu/GrContext.h",
-  "$_include/gpu/GrCoordTransform.h",
   "$_include/gpu/GrExternalTextureData.h",
-  "$_include/gpu/GrFragmentProcessor.h",
   "$_include/gpu/GrGpuResource.h",
-  "$_include/gpu/GrProcessor.h",
-  "$_include/gpu/GrProcessorUnitTest.h",
-  "$_include/gpu/GrProgramElement.h",
   "$_include/gpu/GrGpuResourceRef.h",
   "$_include/gpu/GrRenderTarget.h",
   "$_include/gpu/GrResourceKey.h",
@@ -32,7 +25,6 @@ skia_gpu_sources = [
   "$_include/gpu/GrSurface.h",
   "$_include/gpu/GrTexture.h",
   "$_include/gpu/GrSamplerParams.h",
-  "$_include/gpu/GrTestUtils.h",
   "$_include/gpu/GrTypes.h",
   "$_include/gpu/GrTypesPriv.h",
 
@@ -67,6 +59,7 @@ skia_gpu_sources = [
   "$_src/gpu/GrBlurUtils.cpp",
   "$_src/gpu/GrBlurUtils.h",
   "$_src/gpu/GrBuffer.cpp",
+  "$_src/gpu/GrBuffer.h",
   "$_src/gpu/GrBufferAllocPool.cpp",
   "$_src/gpu/GrBufferAllocPool.h",
   "$_src/gpu/GrCaps.cpp",
@@ -74,9 +67,11 @@ skia_gpu_sources = [
   "$_src/gpu/GrClipStackClip.h",
   "$_src/gpu/GrClipStackClip.cpp",
   "$_src/gpu/GrColorSpaceXform.cpp",
+  "$_src/gpu/GrColorSpaceXform.h",
   "$_src/gpu/GrContext.cpp",
   "$_src/gpu/GrContextPriv.h",
   "$_src/gpu/GrCoordTransform.cpp",
+  "$_src/gpu/GrCoordTransform.h",
   "$_src/gpu/GrDefaultGeoProcFactory.cpp",
   "$_src/gpu/GrDefaultGeoProcFactory.h",
   "$_src/gpu/GrDistanceFieldGenFromVector.cpp",
@@ -90,6 +85,7 @@ skia_gpu_sources = [
   "$_src/gpu/GrFixedClip.cpp",
   "$_src/gpu/GrFixedClip.h",
   "$_src/gpu/GrFragmentProcessor.cpp",
+  "$_src/gpu/GrFragmentProcessor.h",
   "$_src/gpu/GrGeometryProcessor.h",
   "$_src/gpu/GrGlyph.h",
   "$_src/gpu/GrGpu.cpp",
@@ -139,10 +135,13 @@ skia_gpu_sources = [
   "$_src/gpu/GrProcessorSet.h",
   "$_src/gpu/GrProgramDesc.cpp",
   "$_src/gpu/GrProgramDesc.h",
+  "$_src/gpu/GrProgramElement.h",
   "$_src/gpu/GrProcessor.cpp",
+  "$_src/gpu/GrProcessor.h",
   "$_src/gpu/GrProcessorAnalysis.cpp",
   "$_src/gpu/GrProcessorAnalysis.h",
   "$_src/gpu/GrProcessorUnitTest.cpp",
+  "$_src/gpu/GrProcessorUnitTest.h",
   "$_src/gpu/GrGpuResourceRef.cpp",
   "$_src/gpu/GrQuad.h",
   "$_src/gpu/GrRect.h",
@@ -189,6 +188,7 @@ skia_gpu_sources = [
   "$_src/gpu/GrTraceMarker.h",
   "$_src/gpu/GrTracing.h",
   "$_src/gpu/GrTestUtils.cpp",
+  "$_src/gpu/GrTestUtils.h",
   "$_src/gpu/GrShaderVar.cpp",
   "$_src/gpu/GrSWMaskHelper.cpp",
   "$_src/gpu/GrSWMaskHelper.h",

diff --git a/include/gpu/GrBuffer.h b/src/gpu/GrBuffer.h
similarity index 100%
rename from include/gpu/GrBuffer.h
rename to src/gpu/GrBuffer.h

diff --git a/include/gpu/GrColorSpaceXform.h b/src/gpu/GrColorSpaceXform.h
similarity index 100%
rename from include/gpu/GrColorSpaceXform.h
rename to src/gpu/GrColorSpaceXform.h

diff --git a/include/gpu/GrCoordTransform.h b/src/gpu/GrCoordTransform.h
similarity index 100%
rename from include/gpu/GrCoordTransform.h
rename to src/gpu/GrCoordTransform.h

diff --git a/include/gpu/GrFragmentProcessor.h b/src/gpu/GrFragmentProcessor.h
similarity index 100%
rename from include/gpu/GrFragmentProcessor.h
rename to src/gpu/GrFragmentProcessor.h

diff --git a/include/gpu/GrProcessor.h b/src/gpu/GrProcessor.h
similarity index 100%
rename from include/gpu/GrProcessor.h
rename to src/gpu/GrProcessor.h

diff --git a/include/gpu/GrProcessorUnitTest.h b/src/gpu/GrProcessorUnitTest.h
similarity index 100%
rename from include/gpu/GrProcessorUnitTest.h
rename to src/gpu/GrProcessorUnitTest.h

diff --git a/include/gpu/GrProgramElement.h b/src/gpu/GrProgramElement.h
similarity index 100%
rename from include/gpu/GrProgramElement.h
rename to src/gpu/GrProgramElement.h

diff --git a/include/gpu/GrTestUtils.h b/src/gpu/GrTestUtils.h
similarity index 100%
rename from include/gpu/GrTestUtils.h
rename to src/gpu/GrTestUtils.h