Move gpu/include/* to include/gpu and gpu/src/* to src/gpu
Review URL: http://codereview.appspot.com/5250070/
git-svn-id: http://skia.googlecode.com/svn/trunk@2471 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 0b2e4ca..d893f28 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -249,7 +249,7 @@
'../experimental/iOSSampleApp/iPad',
'../experimental/iOSSampleApp/iPhone',
'../include/utils/ios',
- '../../gpu/include',
+ '../../include/gpu',
],
'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig',
'mac_bundle_resources' : [
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 14b7027..83aa525 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -11,7 +11,6 @@
'../include/core',
'../src/core',
'../include/gpu',
- '../gpu/include',
],
'sources': [
'../include/gpu/SkGpuCanvas.h',
@@ -70,140 +69,140 @@
'target_name': 'gr',
'type': 'static_library',
'include_dirs': [
- '../gpu/include',
'../include/core',
'../include/config',
+ '../include/gpu',
],
'dependencies': [
'libtess.gyp:libtess',
],
'sources': [
- '../gpu/include/GrAllocator.h',
- '../gpu/include/GrAllocPool.h',
- '../gpu/include/GrAtlas.h',
- '../gpu/include/GrClip.h',
- '../gpu/include/GrClipIterator.h',
- '../gpu/include/GrColor.h',
- '../gpu/include/GrConfig.h',
- '../gpu/include/GrContext.h',
- '../gpu/include/GrFontScaler.h',
- '../gpu/include/GrGLConfig.h',
- '../gpu/include/GrGLConfig_chrome.h',
- '../gpu/include/GrGLInterface.h',
- '../gpu/include/GrGlyph.h',
- '../gpu/include/GrGpuVertex.h',
- '../gpu/include/GrInstanceCounter.h',
- '../gpu/include/GrIPoint.h',
- '../gpu/include/GrKey.h',
- '../gpu/include/GrMatrix.h',
- '../gpu/include/GrMesh.h',
- '../gpu/include/GrNoncopyable.h',
- '../gpu/include/GrPaint.h',
- '../gpu/include/GrPath.h',
- '../gpu/include/GrPathSink.h',
- '../gpu/include/GrPlotMgr.h',
- '../gpu/include/GrPoint.h',
- '../gpu/include/GrRandom.h',
- '../gpu/include/GrRect.h',
- '../gpu/include/GrRectanizer.h',
- '../gpu/include/GrRefCnt.h',
- '../gpu/include/GrRenderTarget.h',
- '../gpu/include/GrResource.h',
- '../gpu/include/GrSamplerState.h',
- '../gpu/include/GrScalar.h',
- '../gpu/include/GrStencil.h',
- '../gpu/include/GrStopwatch.h',
- '../gpu/include/GrStringBuilder.h',
- '../gpu/include/GrTBSearch.h',
- '../gpu/include/GrTDArray.h',
- '../gpu/include/GrTextContext.h',
- '../gpu/include/GrTextStrike.h',
- '../gpu/include/GrTexture.h',
- '../gpu/include/GrTHashCache.h',
- '../gpu/include/GrTLList.h',
- '../gpu/include/GrTypes.h',
- '../gpu/include/GrUserConfig.h',
+ '../include/gpu/GrAllocator.h',
+ '../include/gpu/GrAllocPool.h',
+ '../include/gpu/GrAtlas.h',
+ '../include/gpu/GrClip.h',
+ '../include/gpu/GrClipIterator.h',
+ '../include/gpu/GrColor.h',
+ '../include/gpu/GrConfig.h',
+ '../include/gpu/GrContext.h',
+ '../include/gpu/GrFontScaler.h',
+ '../include/gpu/GrGLConfig.h',
+ '../include/gpu/GrGLConfig_chrome.h',
+ '../include/gpu/GrGLInterface.h',
+ '../include/gpu/GrGlyph.h',
+ '../include/gpu/GrGpuVertex.h',
+ '../include/gpu/GrInstanceCounter.h',
+ '../include/gpu/GrIPoint.h',
+ '../include/gpu/GrKey.h',
+ '../include/gpu/GrMatrix.h',
+ '../include/gpu/GrMesh.h',
+ '../include/gpu/GrNoncopyable.h',
+ '../include/gpu/GrPaint.h',
+ '../include/gpu/GrPath.h',
+ '../include/gpu/GrPathSink.h',
+ '../include/gpu/GrPlotMgr.h',
+ '../include/gpu/GrPoint.h',
+ '../include/gpu/GrRandom.h',
+ '../include/gpu/GrRect.h',
+ '../include/gpu/GrRectanizer.h',
+ '../include/gpu/GrRefCnt.h',
+ '../include/gpu/GrRenderTarget.h',
+ '../include/gpu/GrResource.h',
+ '../include/gpu/GrSamplerState.h',
+ '../include/gpu/GrScalar.h',
+ '../include/gpu/GrStencil.h',
+ '../include/gpu/GrStopwatch.h',
+ '../include/gpu/GrStringBuilder.h',
+ '../include/gpu/GrTBSearch.h',
+ '../include/gpu/GrTDArray.h',
+ '../include/gpu/GrTextContext.h',
+ '../include/gpu/GrTextStrike.h',
+ '../include/gpu/GrTexture.h',
+ '../include/gpu/GrTHashCache.h',
+ '../include/gpu/GrTLList.h',
+ '../include/gpu/GrTypes.h',
+ '../include/gpu/GrUserConfig.h',
- '../gpu/src/GrAAHairLinePathRenderer.cpp',
- '../gpu/src/GrAAHairLinePathRenderer.h',
- '../gpu/src/GrAddPathRenderers_aahairline.cpp',
- '../gpu/src/GrAllocPool.cpp',
- '../gpu/src/GrAtlas.cpp',
- '../gpu/src/GrBinHashKey.h',
- '../gpu/src/GrBufferAllocPool.cpp',
- '../gpu/src/GrBufferAllocPool.h',
- '../gpu/src/GrClip.cpp',
- '../gpu/src/GrContext.cpp',
- '../gpu/src/GrDefaultPathRenderer.cpp',
- '../gpu/src/GrDefaultPathRenderer.h',
- '../gpu/src/GrDrawTarget.cpp',
- '../gpu/src/GrDrawTarget.h',
- '../gpu/src/GrGeometryBuffer.h',
- '../gpu/src/GrGLDefaultInterface_none.cpp',
- '../gpu/src/GrGLIndexBuffer.cpp',
- '../gpu/src/GrGLIndexBuffer.h',
- '../gpu/src/GrGLInterface.cpp',
- '../gpu/src/GrGLIRect.h',
- '../gpu/src/GrGLProgram.cpp',
- '../gpu/src/GrGLProgram.h',
- '../gpu/src/GrGLRenderTarget.cpp',
- '../gpu/src/GrGLRenderTarget.h',
- '../gpu/src/GrGLShaderVar.h',
- '../gpu/src/GrGLStencilBuffer.cpp',
- '../gpu/src/GrGLStencilBuffer.h',
- '../gpu/src/GrGLTexture.cpp',
- '../gpu/src/GrGLTexture.h',
- '../gpu/src/GrGLUtil.cpp',
- '../gpu/src/GrGLVertexBuffer.cpp',
- '../gpu/src/GrGLVertexBuffer.h',
- '../gpu/src/GrGpu.cpp',
- '../gpu/src/GrGpu.h',
- '../gpu/src/GrGpuFactory.cpp',
- '../gpu/src/GrGpuGL.cpp',
- '../gpu/src/GrGpuGL.h',
- '../gpu/src/GrGpuGLFixed.cpp',
- '../gpu/src/GrGpuGLFixed.h',
- '../gpu/src/GrGpuGLShaders.cpp',
- '../gpu/src/GrGpuGLShaders.h',
- '../gpu/src/GrIndexBuffer.h',
- '../gpu/src/GrInOrderDrawBuffer.cpp',
- '../gpu/src/GrInOrderDrawBuffer.h',
- '../gpu/src/GrMatrix.cpp',
- '../gpu/src/GrMemory.cpp',
- '../gpu/src/GrPathRendererChain.cpp',
- '../gpu/src/GrPathRendererChain.h',
- '../gpu/src/GrPathRenderer.cpp',
- '../gpu/src/GrPathRenderer.h',
- '../gpu/src/GrPathUtils.cpp',
- '../gpu/src/GrPathUtils.h',
- '../gpu/src/GrRectanizer.cpp',
- '../gpu/src/GrRedBlackTree.h',
- '../gpu/src/GrRenderTarget.cpp',
- '../gpu/src/GrResource.cpp',
- '../gpu/src/GrResourceCache.cpp',
- '../gpu/src/GrResourceCache.h',
- '../gpu/src/GrStencil.cpp',
- '../gpu/src/GrStencilBuffer.cpp',
- '../gpu/src/GrStencilBuffer.h',
- '../gpu/src/GrTesselatedPathRenderer.cpp',
- '../gpu/src/GrTesselatedPathRenderer.h',
- '../gpu/src/GrTextContext.cpp',
- '../gpu/src/GrTextStrike.cpp',
- '../gpu/src/GrTextStrike_impl.h',
- '../gpu/src/GrTexture.cpp',
- '../gpu/src/GrVertexBuffer.h',
- '../gpu/src/gr_unittests.cpp',
+ '../src/gpu/GrAAHairLinePathRenderer.cpp',
+ '../src/gpu/GrAAHairLinePathRenderer.h',
+ '../src/gpu/GrAddPathRenderers_aahairline.cpp',
+ '../src/gpu/GrAllocPool.cpp',
+ '../src/gpu/GrAtlas.cpp',
+ '../src/gpu/GrBinHashKey.h',
+ '../src/gpu/GrBufferAllocPool.cpp',
+ '../src/gpu/GrBufferAllocPool.h',
+ '../src/gpu/GrClip.cpp',
+ '../src/gpu/GrContext.cpp',
+ '../src/gpu/GrDefaultPathRenderer.cpp',
+ '../src/gpu/GrDefaultPathRenderer.h',
+ '../src/gpu/GrDrawTarget.cpp',
+ '../src/gpu/GrDrawTarget.h',
+ '../src/gpu/GrGeometryBuffer.h',
+ '../src/gpu/GrGLDefaultInterface_none.cpp',
+ '../src/gpu/GrGLIndexBuffer.cpp',
+ '../src/gpu/GrGLIndexBuffer.h',
+ '../src/gpu/GrGLInterface.cpp',
+ '../src/gpu/GrGLIRect.h',
+ '../src/gpu/GrGLProgram.cpp',
+ '../src/gpu/GrGLProgram.h',
+ '../src/gpu/GrGLRenderTarget.cpp',
+ '../src/gpu/GrGLRenderTarget.h',
+ '../src/gpu/GrGLShaderVar.h',
+ '../src/gpu/GrGLStencilBuffer.cpp',
+ '../src/gpu/GrGLStencilBuffer.h',
+ '../src/gpu/GrGLTexture.cpp',
+ '../src/gpu/GrGLTexture.h',
+ '../src/gpu/GrGLUtil.cpp',
+ '../src/gpu/GrGLVertexBuffer.cpp',
+ '../src/gpu/GrGLVertexBuffer.h',
+ '../src/gpu/GrGpu.cpp',
+ '../src/gpu/GrGpu.h',
+ '../src/gpu/GrGpuFactory.cpp',
+ '../src/gpu/GrGpuGL.cpp',
+ '../src/gpu/GrGpuGL.h',
+ '../src/gpu/GrGpuGLFixed.cpp',
+ '../src/gpu/GrGpuGLFixed.h',
+ '../src/gpu/GrGpuGLShaders.cpp',
+ '../src/gpu/GrGpuGLShaders.h',
+ '../src/gpu/GrIndexBuffer.h',
+ '../src/gpu/GrInOrderDrawBuffer.cpp',
+ '../src/gpu/GrInOrderDrawBuffer.h',
+ '../src/gpu/GrMatrix.cpp',
+ '../src/gpu/GrMemory.cpp',
+ '../src/gpu/GrPathRendererChain.cpp',
+ '../src/gpu/GrPathRendererChain.h',
+ '../src/gpu/GrPathRenderer.cpp',
+ '../src/gpu/GrPathRenderer.h',
+ '../src/gpu/GrPathUtils.cpp',
+ '../src/gpu/GrPathUtils.h',
+ '../src/gpu/GrRectanizer.cpp',
+ '../src/gpu/GrRedBlackTree.h',
+ '../src/gpu/GrRenderTarget.cpp',
+ '../src/gpu/GrResource.cpp',
+ '../src/gpu/GrResourceCache.cpp',
+ '../src/gpu/GrResourceCache.h',
+ '../src/gpu/GrStencil.cpp',
+ '../src/gpu/GrStencilBuffer.cpp',
+ '../src/gpu/GrStencilBuffer.h',
+ '../src/gpu/GrTesselatedPathRenderer.cpp',
+ '../src/gpu/GrTesselatedPathRenderer.h',
+ '../src/gpu/GrTextContext.cpp',
+ '../src/gpu/GrTextStrike.cpp',
+ '../src/gpu/GrTextStrike_impl.h',
+ '../src/gpu/GrTexture.cpp',
+ '../src/gpu/GrVertexBuffer.h',
+ '../src/gpu/gr_unittests.cpp',
- '../gpu/src/mac/GrGLDefaultInterface_mac.cpp',
+ '../src/gpu/mac/GrGLDefaultInterface_mac.cpp',
- '../gpu/src/win/GrGLDefaultInterface_win.cpp',
+ '../src/gpu/win/GrGLDefaultInterface_win.cpp',
- '../gpu/src/unix/GrGLDefaultInterface_unix.cpp',
+ '../src/gpu/unix/GrGLDefaultInterface_unix.cpp',
- '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp',
+ '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp',
],
'sources!': [
- '../gpu/src/mesa/GrGLDefaultInterface_mesa.cpp',
+ '../src/gpu/mesa/GrGLDefaultInterface_mesa.cpp',
],
'defines': [
'GR_IMPLEMENTATION=1',
@@ -214,7 +213,7 @@
'GR_LINUX_BUILD=1',
],
'sources!': [
- '../gpu/src/GrGLDefaultInterface_none.cpp',
+ '../src/gpu/GrGLDefaultInterface_none.cpp',
],
'link_settings': {
'libraries': [
@@ -233,7 +232,7 @@
],
},
'sources!': [
- '../gpu/src/GrGLDefaultInterface_none.cpp',
+ '../src/gpu/GrGLDefaultInterface_none.cpp',
],
}],
[ 'skia_os == "win"', {
@@ -242,22 +241,22 @@
'GR_GL_FUNCTION_TYPE=__stdcall',
],
'sources!': [
- '../gpu/src/GrGLDefaultInterface_none.cpp',
+ '../src/gpu/GrGLDefaultInterface_none.cpp',
],
}],
[ 'skia_os != "win"', {
'sources!': [
- '../gpu/src/win/GrGLDefaultInterface_win.cpp',
+ '../src/gpu/win/GrGLDefaultInterface_win.cpp',
],
}],
[ 'skia_os != "mac"', {
'sources!': [
- '../gpu/src/mac/GrGLDefaultInterface_mac.cpp',
+ '../src/gpu/mac/GrGLDefaultInterface_mac.cpp',
],
}],
[ 'skia_os != "linux"', {
'sources!': [
- '../gpu/src/unix/GrGLDefaultInterface_unix.cpp',
+ '../src/gpu/unix/GrGLDefaultInterface_unix.cpp',
],
}],
],
@@ -281,7 +280,7 @@
}],
],
'include_dirs': [
- '../gpu/include',
+ '../include/gpu',
],
},
},
diff --git a/gyp/iOSSampleApp.gyp b/gyp/iOSSampleApp.gyp
index 63d58b7..4fe7fe2 100644
--- a/gyp/iOSSampleApp.gyp
+++ b/gyp/iOSSampleApp.gyp
@@ -175,7 +175,7 @@
[ 'OS == "mac"', {
'sources!': [
'../samplecode/SampleDecode.cpp',
- '../gpu/src/mac/GrGLDefaultInterface_mac.cpp',
+ '../src/gpu/mac/GrGLDefaultInterface_mac.cpp',
],
'sources': [
# Shared resources
@@ -246,7 +246,7 @@
'../experimental/iOSSampleApp/iPad',
'../experimental/iOSSampleApp/iPhone',
'../include/utils/ios',
- '../../gpu/include',
+ '../../include/gpu',
],
#'xcode_settings' : {
# 'INFOPLIST_FILE' : '../experimental/iOSSampleApp/iOSSampleApp-Info.plist',
diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index 93b1149..c5c3ff6 100644
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -10,7 +10,7 @@
'type': 'executable',
'include_dirs' : [
'../src/core',
- '../gpu/src',
+ '../src/gpu',
],
'sources': [
'../tests/BitmapCopyTest.cpp',
diff --git a/gpu/include/FlingState.h b/include/gpu/FlingState.h
similarity index 100%
rename from gpu/include/FlingState.h
rename to include/gpu/FlingState.h
diff --git a/gpu/include/GrAllocPool.h b/include/gpu/GrAllocPool.h
similarity index 100%
rename from gpu/include/GrAllocPool.h
rename to include/gpu/GrAllocPool.h
diff --git a/gpu/include/GrAllocator.h b/include/gpu/GrAllocator.h
similarity index 100%
rename from gpu/include/GrAllocator.h
rename to include/gpu/GrAllocator.h
diff --git a/gpu/include/GrAtlas.h b/include/gpu/GrAtlas.h
similarity index 100%
rename from gpu/include/GrAtlas.h
rename to include/gpu/GrAtlas.h
diff --git a/gpu/include/GrClip.h b/include/gpu/GrClip.h
similarity index 100%
rename from gpu/include/GrClip.h
rename to include/gpu/GrClip.h
diff --git a/gpu/include/GrClipIterator.h b/include/gpu/GrClipIterator.h
similarity index 100%
rename from gpu/include/GrClipIterator.h
rename to include/gpu/GrClipIterator.h
diff --git a/gpu/include/GrColor.h b/include/gpu/GrColor.h
similarity index 100%
rename from gpu/include/GrColor.h
rename to include/gpu/GrColor.h
diff --git a/gpu/include/GrConfig.h b/include/gpu/GrConfig.h
similarity index 100%
rename from gpu/include/GrConfig.h
rename to include/gpu/GrConfig.h
diff --git a/gpu/include/GrContext.h b/include/gpu/GrContext.h
similarity index 100%
rename from gpu/include/GrContext.h
rename to include/gpu/GrContext.h
diff --git a/gpu/include/GrFontScaler.h b/include/gpu/GrFontScaler.h
similarity index 100%
rename from gpu/include/GrFontScaler.h
rename to include/gpu/GrFontScaler.h
diff --git a/gpu/include/GrGLConfig.h b/include/gpu/GrGLConfig.h
similarity index 100%
rename from gpu/include/GrGLConfig.h
rename to include/gpu/GrGLConfig.h
diff --git a/gpu/include/GrGLConfig_chrome.h b/include/gpu/GrGLConfig_chrome.h
similarity index 100%
rename from gpu/include/GrGLConfig_chrome.h
rename to include/gpu/GrGLConfig_chrome.h
diff --git a/gpu/include/GrGLDefines.h b/include/gpu/GrGLDefines.h
similarity index 100%
rename from gpu/include/GrGLDefines.h
rename to include/gpu/GrGLDefines.h
diff --git a/gpu/include/GrGLInterface.h b/include/gpu/GrGLInterface.h
similarity index 100%
rename from gpu/include/GrGLInterface.h
rename to include/gpu/GrGLInterface.h
diff --git a/gpu/include/GrGlyph.h b/include/gpu/GrGlyph.h
similarity index 100%
rename from gpu/include/GrGlyph.h
rename to include/gpu/GrGlyph.h
diff --git a/gpu/include/GrGpuVertex.h b/include/gpu/GrGpuVertex.h
similarity index 100%
rename from gpu/include/GrGpuVertex.h
rename to include/gpu/GrGpuVertex.h
diff --git a/gpu/include/GrIPoint.h b/include/gpu/GrIPoint.h
similarity index 100%
rename from gpu/include/GrIPoint.h
rename to include/gpu/GrIPoint.h
diff --git a/gpu/include/GrInstanceCounter.h b/include/gpu/GrInstanceCounter.h
similarity index 100%
rename from gpu/include/GrInstanceCounter.h
rename to include/gpu/GrInstanceCounter.h
diff --git a/gpu/include/GrKey.h b/include/gpu/GrKey.h
similarity index 100%
rename from gpu/include/GrKey.h
rename to include/gpu/GrKey.h
diff --git a/gpu/include/GrMatrix.h b/include/gpu/GrMatrix.h
similarity index 100%
rename from gpu/include/GrMatrix.h
rename to include/gpu/GrMatrix.h
diff --git a/gpu/include/GrMesh.h b/include/gpu/GrMesh.h
similarity index 100%
rename from gpu/include/GrMesh.h
rename to include/gpu/GrMesh.h
diff --git a/gpu/include/GrNoncopyable.h b/include/gpu/GrNoncopyable.h
similarity index 100%
rename from gpu/include/GrNoncopyable.h
rename to include/gpu/GrNoncopyable.h
diff --git a/gpu/include/GrPaint.h b/include/gpu/GrPaint.h
similarity index 100%
rename from gpu/include/GrPaint.h
rename to include/gpu/GrPaint.h
diff --git a/gpu/include/GrPath.h b/include/gpu/GrPath.h
similarity index 100%
rename from gpu/include/GrPath.h
rename to include/gpu/GrPath.h
diff --git a/gpu/include/GrPathSink.h b/include/gpu/GrPathSink.h
similarity index 100%
rename from gpu/include/GrPathSink.h
rename to include/gpu/GrPathSink.h
diff --git a/gpu/include/GrPlotMgr.h b/include/gpu/GrPlotMgr.h
similarity index 100%
rename from gpu/include/GrPlotMgr.h
rename to include/gpu/GrPlotMgr.h
diff --git a/gpu/include/GrPoint.h b/include/gpu/GrPoint.h
similarity index 100%
rename from gpu/include/GrPoint.h
rename to include/gpu/GrPoint.h
diff --git a/gpu/include/GrRandom.h b/include/gpu/GrRandom.h
similarity index 100%
rename from gpu/include/GrRandom.h
rename to include/gpu/GrRandom.h
diff --git a/gpu/include/GrRect.h b/include/gpu/GrRect.h
similarity index 100%
rename from gpu/include/GrRect.h
rename to include/gpu/GrRect.h
diff --git a/gpu/include/GrRectanizer.h b/include/gpu/GrRectanizer.h
similarity index 100%
rename from gpu/include/GrRectanizer.h
rename to include/gpu/GrRectanizer.h
diff --git a/gpu/include/GrRefCnt.h b/include/gpu/GrRefCnt.h
similarity index 100%
rename from gpu/include/GrRefCnt.h
rename to include/gpu/GrRefCnt.h
diff --git a/gpu/include/GrRenderTarget.h b/include/gpu/GrRenderTarget.h
similarity index 100%
rename from gpu/include/GrRenderTarget.h
rename to include/gpu/GrRenderTarget.h
diff --git a/gpu/include/GrResource.h b/include/gpu/GrResource.h
similarity index 100%
rename from gpu/include/GrResource.h
rename to include/gpu/GrResource.h
diff --git a/gpu/include/GrSamplerState.h b/include/gpu/GrSamplerState.h
similarity index 100%
rename from gpu/include/GrSamplerState.h
rename to include/gpu/GrSamplerState.h
diff --git a/gpu/include/GrScalar.h b/include/gpu/GrScalar.h
similarity index 100%
rename from gpu/include/GrScalar.h
rename to include/gpu/GrScalar.h
diff --git a/gpu/include/GrStencil.h b/include/gpu/GrStencil.h
similarity index 100%
rename from gpu/include/GrStencil.h
rename to include/gpu/GrStencil.h
diff --git a/gpu/include/GrStopwatch.h b/include/gpu/GrStopwatch.h
similarity index 100%
rename from gpu/include/GrStopwatch.h
rename to include/gpu/GrStopwatch.h
diff --git a/gpu/include/GrStringBuilder.h b/include/gpu/GrStringBuilder.h
similarity index 100%
rename from gpu/include/GrStringBuilder.h
rename to include/gpu/GrStringBuilder.h
diff --git a/gpu/include/GrTBSearch.h b/include/gpu/GrTBSearch.h
similarity index 100%
rename from gpu/include/GrTBSearch.h
rename to include/gpu/GrTBSearch.h
diff --git a/gpu/include/GrTDArray.h b/include/gpu/GrTDArray.h
similarity index 100%
rename from gpu/include/GrTDArray.h
rename to include/gpu/GrTDArray.h
diff --git a/gpu/include/GrTHashCache.h b/include/gpu/GrTHashCache.h
similarity index 100%
rename from gpu/include/GrTHashCache.h
rename to include/gpu/GrTHashCache.h
diff --git a/gpu/include/GrTLList.h b/include/gpu/GrTLList.h
similarity index 100%
rename from gpu/include/GrTLList.h
rename to include/gpu/GrTLList.h
diff --git a/gpu/include/GrTemplates.h b/include/gpu/GrTemplates.h
similarity index 100%
rename from gpu/include/GrTemplates.h
rename to include/gpu/GrTemplates.h
diff --git a/gpu/include/GrTextContext.h b/include/gpu/GrTextContext.h
similarity index 100%
rename from gpu/include/GrTextContext.h
rename to include/gpu/GrTextContext.h
diff --git a/gpu/include/GrTextStrike.h b/include/gpu/GrTextStrike.h
similarity index 100%
rename from gpu/include/GrTextStrike.h
rename to include/gpu/GrTextStrike.h
diff --git a/gpu/include/GrTexture.h b/include/gpu/GrTexture.h
similarity index 100%
rename from gpu/include/GrTexture.h
rename to include/gpu/GrTexture.h
diff --git a/gpu/include/GrTypes.h b/include/gpu/GrTypes.h
similarity index 100%
rename from gpu/include/GrTypes.h
rename to include/gpu/GrTypes.h
diff --git a/gpu/include/GrUserConfig.h b/include/gpu/GrUserConfig.h
similarity index 100%
rename from gpu/include/GrUserConfig.h
rename to include/gpu/GrUserConfig.h
diff --git a/gpu/include/SkUIView.h b/include/gpu/SkUIView.h
similarity index 100%
rename from gpu/include/SkUIView.h
rename to include/gpu/SkUIView.h
diff --git a/gpu/src/FlingState.cpp b/src/gpu/FlingState.cpp
similarity index 100%
rename from gpu/src/FlingState.cpp
rename to src/gpu/FlingState.cpp
diff --git a/gpu/src/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
similarity index 100%
rename from gpu/src/GrAAHairLinePathRenderer.cpp
rename to src/gpu/GrAAHairLinePathRenderer.cpp
diff --git a/gpu/src/GrAAHairLinePathRenderer.h b/src/gpu/GrAAHairLinePathRenderer.h
similarity index 100%
rename from gpu/src/GrAAHairLinePathRenderer.h
rename to src/gpu/GrAAHairLinePathRenderer.h
diff --git a/gpu/src/GrAddPathRenderers_aahairline.cpp b/src/gpu/GrAddPathRenderers_aahairline.cpp
similarity index 100%
rename from gpu/src/GrAddPathRenderers_aahairline.cpp
rename to src/gpu/GrAddPathRenderers_aahairline.cpp
diff --git a/gpu/src/GrAddPathRenderers_none.cpp b/src/gpu/GrAddPathRenderers_none.cpp
similarity index 100%
rename from gpu/src/GrAddPathRenderers_none.cpp
rename to src/gpu/GrAddPathRenderers_none.cpp
diff --git a/gpu/src/GrAddPathRenderers_tesselated.cpp b/src/gpu/GrAddPathRenderers_tesselated.cpp
similarity index 100%
rename from gpu/src/GrAddPathRenderers_tesselated.cpp
rename to src/gpu/GrAddPathRenderers_tesselated.cpp
diff --git a/gpu/src/GrAllocPool.cpp b/src/gpu/GrAllocPool.cpp
similarity index 100%
rename from gpu/src/GrAllocPool.cpp
rename to src/gpu/GrAllocPool.cpp
diff --git a/gpu/src/GrAtlas.cpp b/src/gpu/GrAtlas.cpp
similarity index 100%
rename from gpu/src/GrAtlas.cpp
rename to src/gpu/GrAtlas.cpp
diff --git a/gpu/src/GrBinHashKey.h b/src/gpu/GrBinHashKey.h
similarity index 100%
rename from gpu/src/GrBinHashKey.h
rename to src/gpu/GrBinHashKey.h
diff --git a/gpu/src/GrBufferAllocPool.cpp b/src/gpu/GrBufferAllocPool.cpp
similarity index 100%
rename from gpu/src/GrBufferAllocPool.cpp
rename to src/gpu/GrBufferAllocPool.cpp
diff --git a/gpu/src/GrBufferAllocPool.h b/src/gpu/GrBufferAllocPool.h
similarity index 100%
rename from gpu/src/GrBufferAllocPool.h
rename to src/gpu/GrBufferAllocPool.h
diff --git a/gpu/src/GrClip.cpp b/src/gpu/GrClip.cpp
similarity index 100%
rename from gpu/src/GrClip.cpp
rename to src/gpu/GrClip.cpp
diff --git a/gpu/src/GrContext.cpp b/src/gpu/GrContext.cpp
similarity index 100%
rename from gpu/src/GrContext.cpp
rename to src/gpu/GrContext.cpp
diff --git a/gpu/src/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
similarity index 100%
rename from gpu/src/GrDefaultPathRenderer.cpp
rename to src/gpu/GrDefaultPathRenderer.cpp
diff --git a/gpu/src/GrDefaultPathRenderer.h b/src/gpu/GrDefaultPathRenderer.h
similarity index 100%
rename from gpu/src/GrDefaultPathRenderer.h
rename to src/gpu/GrDefaultPathRenderer.h
diff --git a/gpu/src/GrDrawMesh.cpp b/src/gpu/GrDrawMesh.cpp
similarity index 100%
rename from gpu/src/GrDrawMesh.cpp
rename to src/gpu/GrDrawMesh.cpp
diff --git a/gpu/src/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
similarity index 100%
rename from gpu/src/GrDrawTarget.cpp
rename to src/gpu/GrDrawTarget.cpp
diff --git a/gpu/src/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
similarity index 100%
rename from gpu/src/GrDrawTarget.h
rename to src/gpu/GrDrawTarget.h
diff --git a/gpu/src/GrGLDefaultInterface_none.cpp b/src/gpu/GrGLDefaultInterface_none.cpp
similarity index 100%
rename from gpu/src/GrGLDefaultInterface_none.cpp
rename to src/gpu/GrGLDefaultInterface_none.cpp
diff --git a/gpu/src/GrGLIRect.h b/src/gpu/GrGLIRect.h
similarity index 100%
rename from gpu/src/GrGLIRect.h
rename to src/gpu/GrGLIRect.h
diff --git a/gpu/src/GrGLIndexBuffer.cpp b/src/gpu/GrGLIndexBuffer.cpp
similarity index 100%
rename from gpu/src/GrGLIndexBuffer.cpp
rename to src/gpu/GrGLIndexBuffer.cpp
diff --git a/gpu/src/GrGLIndexBuffer.h b/src/gpu/GrGLIndexBuffer.h
similarity index 100%
rename from gpu/src/GrGLIndexBuffer.h
rename to src/gpu/GrGLIndexBuffer.h
diff --git a/gpu/src/GrGLInterface.cpp b/src/gpu/GrGLInterface.cpp
similarity index 100%
rename from gpu/src/GrGLInterface.cpp
rename to src/gpu/GrGLInterface.cpp
diff --git a/gpu/src/GrGLProgram.cpp b/src/gpu/GrGLProgram.cpp
similarity index 100%
rename from gpu/src/GrGLProgram.cpp
rename to src/gpu/GrGLProgram.cpp
diff --git a/gpu/src/GrGLProgram.h b/src/gpu/GrGLProgram.h
similarity index 100%
rename from gpu/src/GrGLProgram.h
rename to src/gpu/GrGLProgram.h
diff --git a/gpu/src/GrGLRenderTarget.cpp b/src/gpu/GrGLRenderTarget.cpp
similarity index 100%
rename from gpu/src/GrGLRenderTarget.cpp
rename to src/gpu/GrGLRenderTarget.cpp
diff --git a/gpu/src/GrGLRenderTarget.h b/src/gpu/GrGLRenderTarget.h
similarity index 100%
rename from gpu/src/GrGLRenderTarget.h
rename to src/gpu/GrGLRenderTarget.h
diff --git a/gpu/src/GrGLShaderVar.h b/src/gpu/GrGLShaderVar.h
similarity index 100%
rename from gpu/src/GrGLShaderVar.h
rename to src/gpu/GrGLShaderVar.h
diff --git a/gpu/src/GrGLStencilBuffer.cpp b/src/gpu/GrGLStencilBuffer.cpp
similarity index 100%
rename from gpu/src/GrGLStencilBuffer.cpp
rename to src/gpu/GrGLStencilBuffer.cpp
diff --git a/gpu/src/GrGLStencilBuffer.h b/src/gpu/GrGLStencilBuffer.h
similarity index 100%
rename from gpu/src/GrGLStencilBuffer.h
rename to src/gpu/GrGLStencilBuffer.h
diff --git a/gpu/src/GrGLTexture.cpp b/src/gpu/GrGLTexture.cpp
similarity index 100%
rename from gpu/src/GrGLTexture.cpp
rename to src/gpu/GrGLTexture.cpp
diff --git a/gpu/src/GrGLTexture.h b/src/gpu/GrGLTexture.h
similarity index 100%
rename from gpu/src/GrGLTexture.h
rename to src/gpu/GrGLTexture.h
diff --git a/gpu/src/GrGLUtil.cpp b/src/gpu/GrGLUtil.cpp
similarity index 100%
rename from gpu/src/GrGLUtil.cpp
rename to src/gpu/GrGLUtil.cpp
diff --git a/gpu/src/GrGLVertexBuffer.cpp b/src/gpu/GrGLVertexBuffer.cpp
similarity index 100%
rename from gpu/src/GrGLVertexBuffer.cpp
rename to src/gpu/GrGLVertexBuffer.cpp
diff --git a/gpu/src/GrGLVertexBuffer.h b/src/gpu/GrGLVertexBuffer.h
similarity index 100%
rename from gpu/src/GrGLVertexBuffer.h
rename to src/gpu/GrGLVertexBuffer.h
diff --git a/gpu/src/GrGeometryBuffer.h b/src/gpu/GrGeometryBuffer.h
similarity index 100%
rename from gpu/src/GrGeometryBuffer.h
rename to src/gpu/GrGeometryBuffer.h
diff --git a/gpu/src/GrGpu.cpp b/src/gpu/GrGpu.cpp
similarity index 100%
rename from gpu/src/GrGpu.cpp
rename to src/gpu/GrGpu.cpp
diff --git a/gpu/src/GrGpu.h b/src/gpu/GrGpu.h
similarity index 100%
rename from gpu/src/GrGpu.h
rename to src/gpu/GrGpu.h
diff --git a/gpu/src/GrGpuFactory.cpp b/src/gpu/GrGpuFactory.cpp
similarity index 100%
rename from gpu/src/GrGpuFactory.cpp
rename to src/gpu/GrGpuFactory.cpp
diff --git a/gpu/src/GrGpuGL.cpp b/src/gpu/GrGpuGL.cpp
similarity index 100%
rename from gpu/src/GrGpuGL.cpp
rename to src/gpu/GrGpuGL.cpp
diff --git a/gpu/src/GrGpuGL.h b/src/gpu/GrGpuGL.h
similarity index 100%
rename from gpu/src/GrGpuGL.h
rename to src/gpu/GrGpuGL.h
diff --git a/gpu/src/GrGpuGLFixed.cpp b/src/gpu/GrGpuGLFixed.cpp
similarity index 100%
rename from gpu/src/GrGpuGLFixed.cpp
rename to src/gpu/GrGpuGLFixed.cpp
diff --git a/gpu/src/GrGpuGLFixed.h b/src/gpu/GrGpuGLFixed.h
similarity index 100%
rename from gpu/src/GrGpuGLFixed.h
rename to src/gpu/GrGpuGLFixed.h
diff --git a/gpu/src/GrGpuGLShaders.cpp b/src/gpu/GrGpuGLShaders.cpp
similarity index 100%
rename from gpu/src/GrGpuGLShaders.cpp
rename to src/gpu/GrGpuGLShaders.cpp
diff --git a/gpu/src/GrGpuGLShaders.h b/src/gpu/GrGpuGLShaders.h
similarity index 100%
rename from gpu/src/GrGpuGLShaders.h
rename to src/gpu/GrGpuGLShaders.h
diff --git a/gpu/src/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
similarity index 100%
rename from gpu/src/GrInOrderDrawBuffer.cpp
rename to src/gpu/GrInOrderDrawBuffer.cpp
diff --git a/gpu/src/GrInOrderDrawBuffer.h b/src/gpu/GrInOrderDrawBuffer.h
similarity index 100%
rename from gpu/src/GrInOrderDrawBuffer.h
rename to src/gpu/GrInOrderDrawBuffer.h
diff --git a/gpu/src/GrIndexBuffer.h b/src/gpu/GrIndexBuffer.h
similarity index 100%
rename from gpu/src/GrIndexBuffer.h
rename to src/gpu/GrIndexBuffer.h
diff --git a/gpu/src/GrMatrix.cpp b/src/gpu/GrMatrix.cpp
similarity index 100%
rename from gpu/src/GrMatrix.cpp
rename to src/gpu/GrMatrix.cpp
diff --git a/gpu/src/GrMemory.cpp b/src/gpu/GrMemory.cpp
similarity index 100%
rename from gpu/src/GrMemory.cpp
rename to src/gpu/GrMemory.cpp
diff --git a/gpu/src/GrPathRenderer.cpp b/src/gpu/GrPathRenderer.cpp
similarity index 100%
rename from gpu/src/GrPathRenderer.cpp
rename to src/gpu/GrPathRenderer.cpp
diff --git a/gpu/src/GrPathRenderer.h b/src/gpu/GrPathRenderer.h
similarity index 100%
rename from gpu/src/GrPathRenderer.h
rename to src/gpu/GrPathRenderer.h
diff --git a/gpu/src/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
similarity index 100%
rename from gpu/src/GrPathRendererChain.cpp
rename to src/gpu/GrPathRendererChain.cpp
diff --git a/gpu/src/GrPathRendererChain.h b/src/gpu/GrPathRendererChain.h
similarity index 100%
rename from gpu/src/GrPathRendererChain.h
rename to src/gpu/GrPathRendererChain.h
diff --git a/gpu/src/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp
similarity index 100%
rename from gpu/src/GrPathUtils.cpp
rename to src/gpu/GrPathUtils.cpp
diff --git a/gpu/src/GrPathUtils.h b/src/gpu/GrPathUtils.h
similarity index 100%
rename from gpu/src/GrPathUtils.h
rename to src/gpu/GrPathUtils.h
diff --git a/gpu/src/GrPrintf_printf.cpp b/src/gpu/GrPrintf_printf.cpp
similarity index 100%
rename from gpu/src/GrPrintf_printf.cpp
rename to src/gpu/GrPrintf_printf.cpp
diff --git a/gpu/src/GrRectanizer.cpp b/src/gpu/GrRectanizer.cpp
similarity index 100%
rename from gpu/src/GrRectanizer.cpp
rename to src/gpu/GrRectanizer.cpp
diff --git a/gpu/src/GrRectanizer_fifo.cpp b/src/gpu/GrRectanizer_fifo.cpp
similarity index 100%
rename from gpu/src/GrRectanizer_fifo.cpp
rename to src/gpu/GrRectanizer_fifo.cpp
diff --git a/gpu/src/GrRedBlackTree.h b/src/gpu/GrRedBlackTree.h
similarity index 100%
rename from gpu/src/GrRedBlackTree.h
rename to src/gpu/GrRedBlackTree.h
diff --git a/gpu/src/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp
similarity index 100%
rename from gpu/src/GrRenderTarget.cpp
rename to src/gpu/GrRenderTarget.cpp
diff --git a/gpu/src/GrResource.cpp b/src/gpu/GrResource.cpp
similarity index 100%
rename from gpu/src/GrResource.cpp
rename to src/gpu/GrResource.cpp
diff --git a/gpu/src/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp
similarity index 100%
rename from gpu/src/GrResourceCache.cpp
rename to src/gpu/GrResourceCache.cpp
diff --git a/gpu/src/GrResourceCache.h b/src/gpu/GrResourceCache.h
similarity index 100%
rename from gpu/src/GrResourceCache.h
rename to src/gpu/GrResourceCache.h
diff --git a/gpu/src/GrStencil.cpp b/src/gpu/GrStencil.cpp
similarity index 100%
rename from gpu/src/GrStencil.cpp
rename to src/gpu/GrStencil.cpp
diff --git a/gpu/src/GrStencilBuffer.cpp b/src/gpu/GrStencilBuffer.cpp
similarity index 100%
rename from gpu/src/GrStencilBuffer.cpp
rename to src/gpu/GrStencilBuffer.cpp
diff --git a/gpu/src/GrStencilBuffer.h b/src/gpu/GrStencilBuffer.h
similarity index 100%
rename from gpu/src/GrStencilBuffer.h
rename to src/gpu/GrStencilBuffer.h
diff --git a/gpu/src/GrTesselatedPathRenderer.cpp b/src/gpu/GrTesselatedPathRenderer.cpp
similarity index 100%
rename from gpu/src/GrTesselatedPathRenderer.cpp
rename to src/gpu/GrTesselatedPathRenderer.cpp
diff --git a/gpu/src/GrTesselatedPathRenderer.h b/src/gpu/GrTesselatedPathRenderer.h
similarity index 100%
rename from gpu/src/GrTesselatedPathRenderer.h
rename to src/gpu/GrTesselatedPathRenderer.h
diff --git a/gpu/src/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
similarity index 100%
rename from gpu/src/GrTextContext.cpp
rename to src/gpu/GrTextContext.cpp
diff --git a/gpu/src/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp
similarity index 100%
rename from gpu/src/GrTextStrike.cpp
rename to src/gpu/GrTextStrike.cpp
diff --git a/gpu/src/GrTextStrike_impl.h b/src/gpu/GrTextStrike_impl.h
similarity index 100%
rename from gpu/src/GrTextStrike_impl.h
rename to src/gpu/GrTextStrike_impl.h
diff --git a/gpu/src/GrTexture.cpp b/src/gpu/GrTexture.cpp
similarity index 100%
rename from gpu/src/GrTexture.cpp
rename to src/gpu/GrTexture.cpp
diff --git a/gpu/src/GrVertexBuffer.h b/src/gpu/GrVertexBuffer.h
similarity index 100%
rename from gpu/src/GrVertexBuffer.h
rename to src/gpu/GrVertexBuffer.h
diff --git a/gpu/src/android/GrGLDefaultInterface_android.cpp b/src/gpu/android/GrGLDefaultInterface_android.cpp
similarity index 100%
rename from gpu/src/android/GrGLDefaultInterface_android.cpp
rename to src/gpu/android/GrGLDefaultInterface_android.cpp
diff --git a/gpu/src/app-android.cpp b/src/gpu/app-android.cpp
similarity index 100%
rename from gpu/src/app-android.cpp
rename to src/gpu/app-android.cpp
diff --git a/gpu/src/gr_hello_world.cpp b/src/gpu/gr_hello_world.cpp
similarity index 100%
rename from gpu/src/gr_hello_world.cpp
rename to src/gpu/gr_hello_world.cpp
diff --git a/gpu/src/gr_unittests.cpp b/src/gpu/gr_unittests.cpp
similarity index 100%
rename from gpu/src/gr_unittests.cpp
rename to src/gpu/gr_unittests.cpp
diff --git a/gpu/src/ios/GrGLDefaultInterface_iOS.cpp b/src/gpu/ios/GrGLDefaultInterface_iOS.cpp
similarity index 100%
rename from gpu/src/ios/GrGLDefaultInterface_iOS.cpp
rename to src/gpu/ios/GrGLDefaultInterface_iOS.cpp
diff --git a/gpu/src/ios/SkUIView.mm b/src/gpu/ios/SkUIView.mm
similarity index 100%
rename from gpu/src/ios/SkUIView.mm
rename to src/gpu/ios/SkUIView.mm
diff --git a/gpu/src/mac/GrGLDefaultInterface_mac.cpp b/src/gpu/mac/GrGLDefaultInterface_mac.cpp
similarity index 100%
rename from gpu/src/mac/GrGLDefaultInterface_mac.cpp
rename to src/gpu/mac/GrGLDefaultInterface_mac.cpp
diff --git a/gpu/src/mesa/GrGLDefaultInterface_mesa.cpp b/src/gpu/mesa/GrGLDefaultInterface_mesa.cpp
similarity index 100%
rename from gpu/src/mesa/GrGLDefaultInterface_mesa.cpp
rename to src/gpu/mesa/GrGLDefaultInterface_mesa.cpp
diff --git a/gpu/src/unix/GrGLDefaultInterface_unix.cpp b/src/gpu/unix/GrGLDefaultInterface_unix.cpp
similarity index 100%
rename from gpu/src/unix/GrGLDefaultInterface_unix.cpp
rename to src/gpu/unix/GrGLDefaultInterface_unix.cpp
diff --git a/gpu/src/win/GrGLDefaultInterface_win.cpp b/src/gpu/win/GrGLDefaultInterface_win.cpp
similarity index 100%
rename from gpu/src/win/GrGLDefaultInterface_win.cpp
rename to src/gpu/win/GrGLDefaultInterface_win.cpp