diff options
Diffstat (limited to 'gfx/layers/moz.build')
-rw-r--r-- | gfx/layers/moz.build | 82 |
1 files changed, 14 insertions, 68 deletions
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index 2a2fa1169..fb65bd07a 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -1,8 +1,5 @@ # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- # vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. with Files('apz/**'): BUG_COMPONENT = ('Core', 'Panning and Zooming') @@ -22,7 +19,6 @@ EXPORTS += [ 'composite/ImageHost.h', 'CompositorTypes.h', 'CopyableCanvasLayer.h', - 'D3D9SurfaceImage.h', 'FrameMetrics.h', 'GLImages.h', 'GPUVideoImage.h', @@ -46,48 +42,6 @@ EXPORTS += [ 'TiledLayerBuffer.h', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': - SOURCES += [ - 'D3D11ShareHandleImage.cpp', - ] - UNIFIED_SOURCES += [ - 'D3D9SurfaceImage.cpp', - 'IMFYCbCrImage.cpp', - 'TextureDIB.cpp', - ] - EXPORTS.mozilla.layers += [ - 'TextureDIB.h', - ] - if CONFIG['MOZ_ENABLE_D3D9_LAYER']: - EXPORTS += [ - 'd3d9/DeviceManagerD3D9.h', - ] - EXPORTS.mozilla.layers += [ - 'd3d9/CompositorD3D9.h', - 'd3d9/TextureD3D9.h', - ] - UNIFIED_SOURCES += [ - 'd3d9/TextureD3D9.cpp', - ] - SOURCES += [ - 'd3d9/CompositorD3D9.cpp', - 'd3d9/DeviceManagerD3D9.cpp', - 'd3d9/Nv3DVUtils.cpp', - ] - if CONFIG['MOZ_ENABLE_D3D10_LAYER']: - EXPORTS.mozilla.layers += [ - 'd3d11/CompositorD3D11.h', - 'd3d11/ReadbackManagerD3D11.h', - 'd3d11/TextureD3D11.h', - ] - UNIFIED_SOURCES += [ - 'd3d11/TextureD3D11.cpp', - ] - SOURCES += [ - 'd3d11/CompositorD3D11.cpp', - 'd3d11/ReadbackManagerD3D11.cpp', - ] - EXPORTS.gfxipc += [ 'ipc/ShadowLayerUtils.h', ] @@ -156,8 +110,6 @@ EXPORTS.mozilla.layers += [ 'composite/TiledContentHost.h', 'Compositor.h', 'CompositorTypes.h', - 'D3D11ShareHandleImage.h', - 'D3D9SurfaceImage.h', 'Effects.h', 'ImageDataSerializer.h', 'ipc/APZChild.h', @@ -229,21 +181,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 'MacIOSurfaceHelpers.h', 'MacIOSurfaceImage.h', ] - UNIFIED_SOURCES += [ - 'opengl/GLManager.cpp', - ] SOURCES += [ 'ipc/ShadowLayerUtilsMac.cpp', 'MacIOSurfaceHelpers.cpp', 'MacIOSurfaceImage.cpp', + 'opengl/GLManager.cpp', ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - UNIFIED_SOURCES += [ + SOURCES += [ 'apz/src/AndroidAPZ.cpp', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'apz/public/IAPZCTreeManager.cpp', 'apz/src/APZCTreeManager.cpp', 'apz/src/AsyncPanZoomController.cpp', @@ -278,6 +228,7 @@ UNIFIED_SOURCES += [ 'basic/BasicColorLayer.cpp', 'basic/BasicCompositor.cpp', 'basic/BasicContainerLayer.cpp', + 'basic/BasicImageLayer.cpp', 'basic/BasicImages.cpp', 'basic/BasicLayerManager.cpp', 'basic/BasicLayersImpl.cpp', @@ -326,6 +277,7 @@ UNIFIED_SOURCES += [ 'Effects.cpp', 'FrameMetrics.cpp', 'GLImages.cpp', + 'ImageContainer.cpp', 'ImageDataSerializer.cpp', 'ImageLayers.cpp', 'ipc/APZChild.cpp', @@ -335,9 +287,7 @@ UNIFIED_SOURCES += [ 'ipc/CompositableTransactionParent.cpp', 'ipc/CompositorBench.cpp', 'ipc/CompositorBridgeChild.cpp', - 'ipc/CompositorBridgeParent.cpp', 'ipc/CompositorThread.cpp', - 'ipc/CrossProcessCompositorBridgeParent.cpp', 'ipc/ImageBridgeChild.cpp', 'ipc/ImageBridgeParent.cpp', 'ipc/ImageContainerChild.cpp', @@ -355,10 +305,12 @@ UNIFIED_SOURCES += [ 'ipc/SharedRGBImage.cpp', 'ipc/VideoBridgeChild.cpp', 'ipc/VideoBridgeParent.cpp', + 'Layers.cpp', 'LayerScope.cpp', 'LayersLogging.cpp', 'LayerSorter.cpp', 'LayersTypes.cpp', + 'LayerTreeInvalidation.cpp', 'opengl/CompositingRenderTargetOGL.cpp', 'opengl/CompositorOGL.cpp', 'opengl/GLBlitTextureImageHelper.cpp', @@ -366,6 +318,7 @@ UNIFIED_SOURCES += [ 'opengl/TextureClientOGL.cpp', 'opengl/TextureHostOGL.cpp', 'opengl/TexturePoolOGL.cpp', + 'PersistentBufferProvider.cpp', 'protobuf/LayerScopePacket.pb.cc', 'ReadbackProcessor.cpp', 'RenderTrace.cpp', @@ -373,12 +326,11 @@ UNIFIED_SOURCES += [ 'TextureWrapperImage.cpp', ] -SOURCES += [ - 'basic/BasicImageLayer.cpp', - 'ImageContainer.cpp', - 'Layers.cpp', - 'LayerTreeInvalidation.cpp', - 'PersistentBufferProvider.cpp', +# Implementation in CBP.cpp of things used in CPCBP.cpp +# EraseLayerState, UpdateIndirectTree and map<uint64_t, CompositorBridgeParent::LayerTreeState> +UNIFIED_SOURCES += [ + 'ipc/CompositorBridgeParent.cpp', + 'ipc/CrossProcessCompositorBridgeParent.cpp', ] # Disable RTTI in google protocol buffer @@ -425,12 +377,6 @@ LOCAL_INCLUDES += [ FINAL_LIBRARY = 'xul' -if CONFIG['MOZ_DEBUG']: - DEFINES['D3D_DEBUG_INFO'] = True - -if CONFIG['MOZ_ENABLE_D3D10_LAYER']: - DEFINES['MOZ_ENABLE_D3D10_LAYER'] = True - if CONFIG['ENABLE_TESTS']: DIRS += ['apz/test/gtest'] @@ -446,6 +392,6 @@ if CONFIG['GNU_CXX']: CXXFLAGS += ['-Wno-error=shadow'] if CONFIG['MOZ_ENABLE_SKIA']: - UNIFIED_SOURCES += [ + SOURCES += [ 'composite/PaintCounter.cpp', ] |