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

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' : [

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',
         ],
       },
     },

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',

gyp/tests.gyp

@@ -10,7 +10,7 @@
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
-        '../gpu/src',
+        '../src/gpu',
       ],
       'sources': [
         '../tests/BitmapCopyTest.cpp',