mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-22 00:17:32 +09:00
Issue #80- De-unify gfx/layers
Excludes layers/ipc/CompositorBridgeParent and CrossProcessCompositorBridgeParent because the latter purposely uses functions implemented in the former. See also code comment in CrossProcessCompositorBridgeParent.cpp Note: likely dead code for us anyway; likely not worth investing in to solve.
This commit is contained in:
parent
cdd925c155
commit
b8d9e7b8c0
15 changed files with 61 additions and 29 deletions
|
|
@ -49,8 +49,6 @@ EXPORTS += [
|
|||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
SOURCES += [
|
||||
'D3D11ShareHandleImage.cpp',
|
||||
]
|
||||
UNIFIED_SOURCES += [
|
||||
'D3D9SurfaceImage.cpp',
|
||||
'IMFYCbCrImage.cpp',
|
||||
'TextureDIB.cpp',
|
||||
|
|
@ -66,12 +64,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
|||
'd3d9/CompositorD3D9.h',
|
||||
'd3d9/TextureD3D9.h',
|
||||
]
|
||||
UNIFIED_SOURCES += [
|
||||
'd3d9/TextureD3D9.cpp',
|
||||
]
|
||||
SOURCES += [
|
||||
'd3d9/CompositorD3D9.cpp',
|
||||
'd3d9/DeviceManagerD3D9.cpp',
|
||||
'd3d9/TextureD3D9.cpp',
|
||||
]
|
||||
if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
|
||||
EXPORTS.mozilla.layers += [
|
||||
|
|
@ -79,12 +75,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
|||
'd3d11/ReadbackManagerD3D11.h',
|
||||
'd3d11/TextureD3D11.h',
|
||||
]
|
||||
UNIFIED_SOURCES += [
|
||||
'd3d11/TextureD3D11.cpp',
|
||||
]
|
||||
SOURCES += [
|
||||
'd3d11/CompositorD3D11.cpp',
|
||||
'd3d11/ReadbackManagerD3D11.cpp',
|
||||
'd3d11/TextureD3D11.cpp',
|
||||
]
|
||||
|
||||
EXPORTS.gfxipc += [
|
||||
|
|
@ -228,21 +222,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',
|
||||
|
|
@ -277,6 +269,7 @@ UNIFIED_SOURCES += [
|
|||
'basic/BasicColorLayer.cpp',
|
||||
'basic/BasicCompositor.cpp',
|
||||
'basic/BasicContainerLayer.cpp',
|
||||
'basic/BasicImageLayer.cpp',
|
||||
'basic/BasicImages.cpp',
|
||||
'basic/BasicLayerManager.cpp',
|
||||
'basic/BasicLayersImpl.cpp',
|
||||
|
|
@ -325,6 +318,7 @@ UNIFIED_SOURCES += [
|
|||
'Effects.cpp',
|
||||
'FrameMetrics.cpp',
|
||||
'GLImages.cpp',
|
||||
'ImageContainer.cpp',
|
||||
'ImageDataSerializer.cpp',
|
||||
'ImageLayers.cpp',
|
||||
'ipc/APZChild.cpp',
|
||||
|
|
@ -334,9 +328,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',
|
||||
|
|
@ -354,10 +346,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',
|
||||
|
|
@ -365,6 +359,7 @@ UNIFIED_SOURCES += [
|
|||
'opengl/TextureClientOGL.cpp',
|
||||
'opengl/TextureHostOGL.cpp',
|
||||
'opengl/TexturePoolOGL.cpp',
|
||||
'PersistentBufferProvider.cpp',
|
||||
'protobuf/LayerScopePacket.pb.cc',
|
||||
'ReadbackProcessor.cpp',
|
||||
'RenderTrace.cpp',
|
||||
|
|
@ -372,12 +367,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
|
||||
|
|
@ -445,6 +439,6 @@ if CONFIG['GNU_CXX']:
|
|||
CXXFLAGS += ['-Wno-error=shadow']
|
||||
|
||||
if CONFIG['MOZ_ENABLE_SKIA']:
|
||||
UNIFIED_SOURCES += [
|
||||
SOURCES += [
|
||||
'composite/PaintCounter.cpp',
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue