Commit 04bac60c by Brett Wilson Committed by Jamie Madill

Explicitly list files for the build.

Removes shelling out to enumerate_files for the main targets (tests and examples are currently unchanged) in favor of explicitly listing out the files in the build. There are a number of reasons. My immediate reason is that doing this allows the file lists to be shared with the GN build so the GYP and GN builds of angle should mostly automatically stay in sync now. In addition, I don't think we should be enumerating files in GYP. No other Chrome sub-projects do this, and Chrome engineers expect files to be listed in .gyp* files. It's also slower to shell out a bunch of times to get the file lists (this matters more in the GN build which runs very quickly). Updates the GN build to share these file lists. This unbreaks the Windows GN Angle build. BUG=angle:698 Change-Id: Iab8829628aeb7232bb64f4c247c35c6485bba3ee Reviewed-on: https://chromium-review.googlesource.com/208461Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarBrett Wilson <brettw@chromium.org> Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org>
parent e40d1e9c
...@@ -2,6 +2,27 @@ ...@@ -2,6 +2,27 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
if (is_win) {
# Only needed on Windows.
gles_gypi = exec_script(
"//build/gypi_to_gn.py",
[ rebase_path("src/libGLESv2.gypi") ],
"scope",
[ "src/libGLESv2.gypi" ])
egl_gypi = exec_script(
"//build/gypi_to_gn.py",
[ rebase_path("src/libEGL.gypi") ],
"scope",
[ "src/libEGL.gypi" ])
}
compiler_gypi = exec_script(
"//build/gypi_to_gn.py",
[ rebase_path("src/compiler.gypi") ],
"scope",
[ "src/compiler.gypi" ])
# This config is applied to internal Angle targets (not pushed to dependents). # This config is applied to internal Angle targets (not pushed to dependents).
config("internal_config") { config("internal_config") {
include_dirs = [ include_dirs = [
...@@ -46,184 +67,17 @@ source_set("includes") { ...@@ -46,184 +67,17 @@ source_set("includes") {
} }
static_library("preprocessor") { static_library("preprocessor") {
sources = [ sources = rebase_path(compiler_gypi.angle_preprocessor_sources, ".", "src")
"src/compiler/preprocessor/DiagnosticsBase.cpp",
"src/compiler/preprocessor/DiagnosticsBase.h",
"src/compiler/preprocessor/DirectiveHandlerBase.cpp",
"src/compiler/preprocessor/DirectiveHandlerBase.h",
"src/compiler/preprocessor/DirectiveParser.cpp",
"src/compiler/preprocessor/DirectiveParser.h",
"src/compiler/preprocessor/ExpressionParser.cpp",
"src/compiler/preprocessor/ExpressionParser.h",
"src/compiler/preprocessor/ExpressionParser.y",
"src/compiler/preprocessor/Input.cpp",
"src/compiler/preprocessor/Input.h",
"src/compiler/preprocessor/Lexer.cpp",
"src/compiler/preprocessor/Lexer.h",
"src/compiler/preprocessor/Macro.cpp",
"src/compiler/preprocessor/Macro.h",
"src/compiler/preprocessor/MacroExpander.cpp",
"src/compiler/preprocessor/MacroExpander.h",
"src/compiler/preprocessor/Preprocessor.cpp",
"src/compiler/preprocessor/Preprocessor.h",
"src/compiler/preprocessor/SourceLocation.h",
"src/compiler/preprocessor/Token.cpp",
"src/compiler/preprocessor/Token.h",
"src/compiler/preprocessor/Tokenizer.cpp",
"src/compiler/preprocessor/Tokenizer.h",
"src/compiler/preprocessor/Tokenizer.l",
"src/compiler/preprocessor/numeric_lex.h",
"src/compiler/preprocessor/pp_utils.h",
]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
":internal_config", ":internal_config",
"//build/config/compiler:no_chromium_code", "//build/config/compiler:no_chromium_code",
] ]
} }
static_library("translator_lib") { static_library("translator_lib") {
sources = [ sources = rebase_path(compiler_gypi.angle_translator_lib_sources, ".", "src")
"src/common/RefCountObject.cpp",
"src/common/RefCountObject.h",
"src/common/angleutils.h",
"src/common/blocklayout.cpp",
"src/common/blocklayout.h",
"src/common/debug.cpp",
"src/common/debug.h",
"src/common/event_tracer.cpp",
"src/common/event_tracer.h",
"src/common/mathutil.cpp",
"src/common/mathutil.h",
"src/common/platform.h",
"src/common/shadervars.h",
"src/common/tls.cpp",
"src/common/tls.h",
"src/common/utilities.cpp",
"src/common/utilities.h",
"src/common/version.h",
"src/compiler/translator/BaseTypes.h",
"src/compiler/translator/BuiltInFunctionEmulator.cpp",
"src/compiler/translator/BuiltInFunctionEmulator.h",
"src/compiler/translator/CodeGen.cpp",
"src/compiler/translator/Common.h",
"src/compiler/translator/Compiler.cpp",
"src/compiler/translator/ConstantUnion.h",
"src/compiler/translator/DetectCallDepth.cpp",
"src/compiler/translator/DetectCallDepth.h",
"src/compiler/translator/DetectDiscontinuity.cpp",
"src/compiler/translator/DetectDiscontinuity.h",
"src/compiler/translator/Diagnostics.cpp",
"src/compiler/translator/Diagnostics.h",
"src/compiler/translator/DirectiveHandler.cpp",
"src/compiler/translator/DirectiveHandler.h",
"src/compiler/translator/ExtensionBehavior.h",
"src/compiler/translator/FlagStd140Structs.cpp",
"src/compiler/translator/FlagStd140Structs.h",
"src/compiler/translator/ForLoopUnroll.cpp",
"src/compiler/translator/ForLoopUnroll.h",
"src/compiler/translator/HashNames.h",
"src/compiler/translator/InfoSink.cpp",
"src/compiler/translator/InfoSink.h",
"src/compiler/translator/Initialize.cpp",
"src/compiler/translator/Initialize.h",
"src/compiler/translator/InitializeDll.cpp",
"src/compiler/translator/InitializeDll.h",
"src/compiler/translator/InitializeGlobals.h",
"src/compiler/translator/InitializeParseContext.cpp",
"src/compiler/translator/InitializeParseContext.h",
"src/compiler/translator/InitializeVariables.cpp",
"src/compiler/translator/InitializeVariables.h",
"src/compiler/translator/IntermTraverse.cpp",
"src/compiler/translator/Intermediate.cpp",
"src/compiler/translator/LoopInfo.cpp",
"src/compiler/translator/LoopInfo.h",
"src/compiler/translator/MMap.h",
"src/compiler/translator/NodeSearch.h",
"src/compiler/translator/OutputESSL.cpp",
"src/compiler/translator/OutputESSL.h",
"src/compiler/translator/OutputGLSL.cpp",
"src/compiler/translator/OutputGLSL.h",
"src/compiler/translator/OutputGLSLBase.cpp",
"src/compiler/translator/OutputGLSLBase.h",
"src/compiler/translator/OutputHLSL.cpp",
"src/compiler/translator/OutputHLSL.h",
"src/compiler/translator/ParseContext.cpp",
"src/compiler/translator/ParseContext.h",
"src/compiler/translator/PoolAlloc.cpp",
"src/compiler/translator/PoolAlloc.h",
"src/compiler/translator/Pragma.h",
"src/compiler/translator/QualifierAlive.cpp",
"src/compiler/translator/QualifierAlive.h",
"src/compiler/translator/RemoveTree.cpp",
"src/compiler/translator/RemoveTree.h",
"src/compiler/translator/RenameFunction.h",
"src/compiler/translator/RewriteElseBlocks.cpp",
"src/compiler/translator/RewriteElseBlocks.h",
"src/compiler/translator/SearchSymbol.cpp",
"src/compiler/translator/SearchSymbol.h",
"src/compiler/translator/ShHandle.h",
"src/compiler/translator/StructureHLSL.cpp",
"src/compiler/translator/StructureHLSL.h",
"src/compiler/translator/SymbolTable.cpp",
"src/compiler/translator/SymbolTable.h",
"src/compiler/translator/TranslatorESSL.cpp",
"src/compiler/translator/TranslatorESSL.h",
"src/compiler/translator/TranslatorGLSL.cpp",
"src/compiler/translator/TranslatorGLSL.h",
"src/compiler/translator/TranslatorHLSL.cpp",
"src/compiler/translator/TranslatorHLSL.h",
"src/compiler/translator/Types.cpp",
"src/compiler/translator/Types.h",
"src/compiler/translator/UnfoldShortCircuit.cpp",
"src/compiler/translator/UnfoldShortCircuit.h",
"src/compiler/translator/UnfoldShortCircuitAST.cpp",
"src/compiler/translator/UnfoldShortCircuitAST.h",
"src/compiler/translator/UniformHLSL.cpp",
"src/compiler/translator/UniformHLSL.h",
"src/compiler/translator/UtilsHLSL.cpp",
"src/compiler/translator/UtilsHLSL.h",
"src/compiler/translator/ValidateLimitations.cpp",
"src/compiler/translator/ValidateLimitations.h",
"src/compiler/translator/ValidateOutputs.cpp",
"src/compiler/translator/ValidateOutputs.h",
"src/compiler/translator/VariableInfo.cpp",
"src/compiler/translator/VariableInfo.h",
"src/compiler/translator/VariablePacker.cpp",
"src/compiler/translator/VariablePacker.h",
"src/compiler/translator/VersionGLSL.cpp",
"src/compiler/translator/VersionGLSL.h",
"src/compiler/translator/compilerdebug.cpp",
"src/compiler/translator/compilerdebug.h",
"src/compiler/translator/depgraph/DependencyGraph.cpp",
"src/compiler/translator/depgraph/DependencyGraph.h",
"src/compiler/translator/depgraph/DependencyGraphBuilder.cpp",
"src/compiler/translator/depgraph/DependencyGraphBuilder.h",
"src/compiler/translator/depgraph/DependencyGraphOutput.cpp",
"src/compiler/translator/depgraph/DependencyGraphOutput.h",
"src/compiler/translator/depgraph/DependencyGraphTraverse.cpp",
"src/compiler/translator/glslang.h",
"src/compiler/translator/glslang.l",
"src/compiler/translator/glslang.y",
"src/compiler/translator/glslang_lex.cpp",
"src/compiler/translator/glslang_tab.cpp",
"src/compiler/translator/glslang_tab.h",
"src/compiler/translator/intermOut.cpp",
"src/compiler/translator/intermediate.h",
"src/compiler/translator/length_limits.h",
"src/compiler/translator/localintermediate.h",
"src/compiler/translator/parseConst.cpp",
"src/compiler/translator/timing/RestrictFragmentShaderTiming.cpp",
"src/compiler/translator/timing/RestrictFragmentShaderTiming.h",
"src/compiler/translator/timing/RestrictVertexShaderTiming.cpp",
"src/compiler/translator/timing/RestrictVertexShaderTiming.h",
"src/compiler/translator/util.cpp",
"src/compiler/translator/util.h",
"src/third_party/compiler/ArrayBoundsClamper.cpp",
"src/third_party/compiler/ArrayBoundsClamper.h",
]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
...@@ -282,123 +136,7 @@ if (is_win) { ...@@ -282,123 +136,7 @@ if (is_win) {
angle_enable_d3d11 = true angle_enable_d3d11 = true
shared_library("libGLESv2") { shared_library("libGLESv2") {
sources = [ sources = rebase_path(gles_gypi.angle_libglesv2_sources, ".", "src")
"src/common/RefCountObject.cpp",
"src/common/RefCountObject.h",
"src/common/angleutils.h",
"src/common/blocklayout.cpp",
"src/common/blocklayout.h",
"src/common/debug.cpp",
"src/common/debug.h",
"src/common/event_tracer.cpp",
"src/common/event_tracer.h",
"src/common/mathutil.cpp",
"src/common/mathutil.h",
"src/common/platform.h",
"src/common/shadervars.h",
"src/common/tls.cpp",
"src/common/tls.h",
"src/common/utilities.cpp",
"src/common/utilities.h",
"src/common/version.h",
"src/libGLESv2/BinaryStream.h",
"src/libGLESv2/Buffer.cpp",
"src/libGLESv2/Buffer.h",
"src/libGLESv2/Caps.cpp",
"src/libGLESv2/Caps.h",
"src/libGLESv2/Context.cpp",
"src/libGLESv2/Context.h",
"src/libGLESv2/DynamicHLSL.cpp",
"src/libGLESv2/DynamicHLSL.h",
"src/libGLESv2/Fence.cpp",
"src/libGLESv2/Fence.h",
"src/libGLESv2/Float16ToFloat32.cpp",
"src/libGLESv2/Framebuffer.cpp",
"src/libGLESv2/Framebuffer.h",
"src/libGLESv2/FramebufferAttachment.cpp",
"src/libGLESv2/FramebufferAttachment.h",
"src/libGLESv2/HandleAllocator.cpp",
"src/libGLESv2/HandleAllocator.h",
"src/libGLESv2/Program.cpp",
"src/libGLESv2/Program.h",
"src/libGLESv2/ProgramBinary.cpp",
"src/libGLESv2/ProgramBinary.h",
"src/libGLESv2/Query.cpp",
"src/libGLESv2/Query.h",
"src/libGLESv2/Renderbuffer.cpp",
"src/libGLESv2/Renderbuffer.h",
"src/libGLESv2/RenderbufferProxySet.cpp",
"src/libGLESv2/RenderbufferProxySet.h",
"src/libGLESv2/ResourceManager.cpp",
"src/libGLESv2/ResourceManager.h",
"src/libGLESv2/Sampler.cpp",
"src/libGLESv2/Sampler.h",
"src/libGLESv2/Shader.cpp",
"src/libGLESv2/Shader.h",
"src/libGLESv2/State.cpp",
"src/libGLESv2/State.h",
"src/libGLESv2/Texture.cpp",
"src/libGLESv2/Texture.h",
"src/libGLESv2/TransformFeedback.cpp",
"src/libGLESv2/TransformFeedback.h",
"src/libGLESv2/Uniform.cpp",
"src/libGLESv2/Uniform.h",
"src/libGLESv2/VertexArray.cpp",
"src/libGLESv2/VertexArray.h",
"src/libGLESv2/VertexAttribute.h",
"src/libGLESv2/VertexAttribute.cpp",
"src/libGLESv2/angletypes.cpp",
"src/libGLESv2/angletypes.h",
"src/libGLESv2/constants.h",
"src/libGLESv2/formatutils.cpp",
"src/libGLESv2/formatutils.h",
"src/libGLESv2/libGLESv2.cpp",
"src/libGLESv2/libGLESv2.def",
"src/libGLESv2/libGLESv2.rc",
"src/libGLESv2/main.cpp",
"src/libGLESv2/main.h",
"src/libGLESv2/precompiled.cpp",
"src/libGLESv2/precompiled.h",
"src/libGLESv2/queryconversions.cpp",
"src/libGLESv2/queryconversions.h",
"src/libGLESv2/renderer/BufferStorage.cpp",
"src/libGLESv2/renderer/BufferStorage.h",
"src/libGLESv2/renderer/FenceImpl.h",
"src/libGLESv2/renderer/Image.cpp",
"src/libGLESv2/renderer/Image.h",
"src/libGLESv2/renderer/IndexRangeCache.cpp",
"src/libGLESv2/renderer/IndexRangeCache.h",
"src/libGLESv2/renderer/QueryImpl.h",
"src/libGLESv2/renderer/RenderTarget.h",
"src/libGLESv2/renderer/Renderer.cpp",
"src/libGLESv2/renderer/Renderer.h",
"src/libGLESv2/renderer/ShaderExecutable.h",
"src/libGLESv2/renderer/SwapChain.h",
"src/libGLESv2/renderer/TextureImpl.h",
"src/libGLESv2/renderer/VertexArrayImpl.h",
"src/libGLESv2/renderer/copyimage.cpp",
"src/libGLESv2/renderer/copyimage.h",
"src/libGLESv2/renderer/copyvertex.h",
"src/libGLESv2/renderer/generatemip.h",
"src/libGLESv2/renderer/generatemip.inl",
"src/libGLESv2/renderer/imageformats.h",
"src/libGLESv2/renderer/loadimage.cpp",
"src/libGLESv2/renderer/loadimage.h",
"src/libGLESv2/renderer/loadimage.inl",
"src/libGLESv2/renderer/loadimageSSE2.cpp",
"src/libGLESv2/renderer/vertexconversion.h",
"src/libGLESv2/resource.h",
"src/libGLESv2/validationES.cpp",
"src/libGLESv2/validationES.h",
"src/libGLESv2/validationES2.cpp",
"src/libGLESv2/validationES2.h",
"src/libGLESv2/validationES3.cpp",
"src/libGLESv2/validationES3.h",
"src/third_party/murmurhash/MurmurHash3.cpp",
"src/third_party/murmurhash/MurmurHash3.h",
"src/third_party/systeminfo/SystemInfo.cpp",
"src/third_party/systeminfo/SystemInfo.h",
]
defines = [ defines = [
"ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " + "ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " +
...@@ -411,166 +149,17 @@ if (is_win) { ...@@ -411,166 +149,17 @@ if (is_win) {
# Shared D3dD sources. # Shared D3dD sources.
if (angle_enable_d3d9 || angle_enable_d3d11) { if (angle_enable_d3d9 || angle_enable_d3d11) {
sources += [ sources += rebase_path(gles_gypi.angle_d3d_shared_sources, ".", "src")
"src/libGLESv2/renderer/d3d/BufferD3D.cpp",
"src/libGLESv2/renderer/d3d/BufferD3D.h",
"src/libGLESv2/renderer/d3d/HLSLCompiler.cpp",
"src/libGLESv2/renderer/d3d/HLSLCompiler.h",
"src/libGLESv2/renderer/d3d/ImageD3D.cpp",
"src/libGLESv2/renderer/d3d/ImageD3D.h",
"src/libGLESv2/renderer/d3d/IndexBuffer.cpp",
"src/libGLESv2/renderer/d3d/IndexBuffer.h",
"src/libGLESv2/renderer/d3d/IndexDataManager.cpp",
"src/libGLESv2/renderer/d3d/IndexDataManager.h",
"src/libGLESv2/renderer/d3d/TextureD3D.cpp",
"src/libGLESv2/renderer/d3d/TextureD3D.h",
"src/libGLESv2/renderer/d3d/TextureStorage.cpp",
"src/libGLESv2/renderer/d3d/TextureStorage.h",
"src/libGLESv2/renderer/d3d/VertexBuffer.cpp",
"src/libGLESv2/renderer/d3d/VertexBuffer.h",
"src/libGLESv2/renderer/d3d/VertexDataManager.cpp",
"src/libGLESv2/renderer/d3d/VertexDataManager.h",
]
} }
if (angle_enable_d3d9) { if (angle_enable_d3d9) {
sources += [ sources += rebase_path(gles_gypi.angle_d3d9_sources, ".", "src")
"src/libGLESv2/renderer/d3d9/Blit9.cpp",
"src/libGLESv2/renderer/d3d9/Blit9.h",
"src/libGLESv2/renderer/d3d9/BufferStorage9.cpp",
"src/libGLESv2/renderer/d3d9/BufferStorage9.h",
"src/libGLESv2/renderer/d3d9/Fence9.cpp",
"src/libGLESv2/renderer/d3d9/Fence9.h",
"src/libGLESv2/renderer/d3d9/Image9.cpp",
"src/libGLESv2/renderer/d3d9/Image9.h",
"src/libGLESv2/renderer/d3d9/IndexBuffer9.cpp",
"src/libGLESv2/renderer/d3d9/IndexBuffer9.h",
"src/libGLESv2/renderer/d3d9/Query9.cpp",
"src/libGLESv2/renderer/d3d9/Query9.h",
"src/libGLESv2/renderer/d3d9/RenderTarget9.cpp",
"src/libGLESv2/renderer/d3d9/RenderTarget9.h",
"src/libGLESv2/renderer/d3d9/Renderer9.cpp",
"src/libGLESv2/renderer/d3d9/Renderer9.h",
"src/libGLESv2/renderer/d3d9/ShaderCache.h",
"src/libGLESv2/renderer/d3d9/ShaderExecutable9.cpp",
"src/libGLESv2/renderer/d3d9/ShaderExecutable9.h",
"src/libGLESv2/renderer/d3d9/SwapChain9.cpp",
"src/libGLESv2/renderer/d3d9/SwapChain9.h",
"src/libGLESv2/renderer/d3d9/TextureStorage9.cpp",
"src/libGLESv2/renderer/d3d9/TextureStorage9.h",
"src/libGLESv2/renderer/d3d9/VertexArray9.h",
"src/libGLESv2/renderer/d3d9/VertexBuffer9.cpp",
"src/libGLESv2/renderer/d3d9/VertexBuffer9.h",
"src/libGLESv2/renderer/d3d9/VertexDeclarationCache.cpp",
"src/libGLESv2/renderer/d3d9/VertexDeclarationCache.h",
"src/libGLESv2/renderer/d3d9/formatutils9.cpp",
"src/libGLESv2/renderer/d3d9/formatutils9.h",
"src/libGLESv2/renderer/d3d9/renderer9_utils.cpp",
"src/libGLESv2/renderer/d3d9/renderer9_utils.h",
"src/libGLESv2/renderer/d3d9/shaders/compiled/componentmaskps.h",
"src/libGLESv2/renderer/d3d9/shaders/compiled/flipyvs.h",
"src/libGLESv2/renderer/d3d9/shaders/compiled/luminanceps.h",
"src/libGLESv2/renderer/d3d9/shaders/compiled/passthroughps.h",
"src/libGLESv2/renderer/d3d9/shaders/compiled/standardvs.h",
]
defines += [ "ANGLE_ENABLE_D3D9" ] defines += [ "ANGLE_ENABLE_D3D9" ]
libs += [ "d3d9.lib" ] libs += [ "d3d9.lib" ]
} }
if (angle_enable_d3d11) { if (angle_enable_d3d11) {
sources += [ sources += rebase_path(gles_gypi.angle_d3d11_sources, ".", "src")
"src/libGLESv2/renderer/d3d11/Blit11.cpp",
"src/libGLESv2/renderer/d3d11/Blit11.h",
"src/libGLESv2/renderer/d3d11/BufferStorage11.cpp",
"src/libGLESv2/renderer/d3d11/BufferStorage11.h",
"src/libGLESv2/renderer/d3d11/Clear11.cpp",
"src/libGLESv2/renderer/d3d11/Clear11.h",
"src/libGLESv2/renderer/d3d11/Fence11.cpp",
"src/libGLESv2/renderer/d3d11/Fence11.h",
"src/libGLESv2/renderer/d3d11/Image11.cpp",
"src/libGLESv2/renderer/d3d11/Image11.h",
"src/libGLESv2/renderer/d3d11/IndexBuffer11.cpp",
"src/libGLESv2/renderer/d3d11/IndexBuffer11.h",
"src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp",
"src/libGLESv2/renderer/d3d11/InputLayoutCache.h",
"src/libGLESv2/renderer/d3d11/PixelTransfer11.cpp",
"src/libGLESv2/renderer/d3d11/PixelTransfer11.h",
"src/libGLESv2/renderer/d3d11/Query11.cpp",
"src/libGLESv2/renderer/d3d11/Query11.h",
"src/libGLESv2/renderer/d3d11/RenderStateCache.cpp",
"src/libGLESv2/renderer/d3d11/RenderStateCache.h",
"src/libGLESv2/renderer/d3d11/RenderTarget11.cpp",
"src/libGLESv2/renderer/d3d11/RenderTarget11.h",
"src/libGLESv2/renderer/d3d11/Renderer11.cpp",
"src/libGLESv2/renderer/d3d11/Renderer11.h",
"src/libGLESv2/renderer/d3d11/ShaderExecutable11.cpp",
"src/libGLESv2/renderer/d3d11/ShaderExecutable11.h",
"src/libGLESv2/renderer/d3d11/SwapChain11.cpp",
"src/libGLESv2/renderer/d3d11/SwapChain11.h",
"src/libGLESv2/renderer/d3d11/TextureStorage11.cpp",
"src/libGLESv2/renderer/d3d11/TextureStorage11.h",
"src/libGLESv2/renderer/d3d11/VertexArray11.h",
"src/libGLESv2/renderer/d3d11/VertexBuffer11.cpp",
"src/libGLESv2/renderer/d3d11/VertexBuffer11.h",
"src/libGLESv2/renderer/d3d11/formatutils11.cpp",
"src/libGLESv2/renderer/d3d11/formatutils11.h",
"src/libGLESv2/renderer/d3d11/renderer11_utils.cpp",
"src/libGLESv2/renderer/d3d11/renderer11_utils.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/buffertotexture11_gs.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/buffertotexture11_ps_4f.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/buffertotexture11_ps_4i.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/buffertotexture11_vs.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/clearfloat11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/clearfloat11vs.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/clearsint11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/clearsint11vs.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/clearuint11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/clearuint11vs.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthrough2d11vs.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthrough3d11gs.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthrough3d11vs.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughdepth2d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughlum2d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughlum3d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughr2d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughr2di11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughr2dui11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughr3d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughr3di11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughr3dui11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrg2d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrg2di11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrg2dui11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrg3d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrg3di11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrg3dui11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgb2d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgb2di11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgb2dui11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgb3d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgb3di11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgb3dui11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgba2d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgba2di11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgba2dui11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgba3d11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgba3di11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/passthroughrgba3dui11ps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/swizzlef2darrayps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/swizzlef2dps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/swizzlef3dps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/swizzlei2darrayps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/swizzlei2dps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/swizzlei3dps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/swizzleui2darrayps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/swizzleui2dps.h",
"src/libGLESv2/renderer/d3d11/shaders/compiled/swizzleui3dps.h",
]
defines += [ "ANGLE_ENABLE_D3D11" ] defines += [ "ANGLE_ENABLE_D3D11" ]
libs += [ "dxguid.lib" ] libs += [ "dxguid.lib" ]
} }
...@@ -597,35 +186,7 @@ if (is_win) { ...@@ -597,35 +186,7 @@ if (is_win) {
} }
shared_library("libEGL") { shared_library("libEGL") {
sources = [ sources = rebase_path(egl_gypi.angle_libegl_sources, ".", "src")
"src/common/RefCountObject.cpp",
"src/common/RefCountObject.h",
"src/common/angleutils.h",
"src/common/blocklayout.cpp",
"src/common/blocklayout.h",
"src/common/debug.cpp",
"src/common/debug.h",
"src/common/event_tracer.cpp",
"src/common/event_tracer.h",
"src/common/mathutil.cpp",
"src/common/mathutil.h",
"src/common/shadervars.h",
"src/common/utilities.cpp",
"src/common/utilities.h",
"src/common/version.h",
"src/libEGL/Config.cpp",
"src/libEGL/Config.h",
"src/libEGL/Display.cpp",
"src/libEGL/Display.h",
"src/libEGL/Surface.cpp",
"src/libEGL/Surface.h",
"src/libEGL/libEGL.cpp",
"src/libEGL/libEGL.def",
"src/libEGL/libEGL.rc",
"src/libEGL/main.cpp",
"src/libEGL/main.h",
"src/libEGL/resource.h",
]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [
......
...@@ -3,13 +3,203 @@ ...@@ -3,13 +3,203 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'variables':
{
# This file list is shared with the GN build.
'angle_translator_lib_sources':
[
'../include/EGL/egl.h',
'../include/EGL/eglext.h',
'../include/EGL/eglplatform.h',
'../include/GLES2/gl2.h',
'../include/GLES2/gl2ext.h',
'../include/GLES2/gl2platform.h',
'../include/GLES3/gl3.h',
'../include/GLES3/gl3ext.h',
'../include/GLES3/gl3platform.h',
'../include/GLSLANG/ShaderLang.h',
'../include/KHR/khrplatform.h',
'../include/angle_gl.h',
'common/RefCountObject.cpp',
'common/RefCountObject.h',
'common/angleutils.h',
'common/blocklayout.cpp',
'common/blocklayout.h',
'common/debug.cpp',
'common/debug.h',
'common/event_tracer.cpp',
'common/event_tracer.h',
'common/mathutil.cpp',
'common/mathutil.h',
'common/platform.h',
'common/shadervars.h',
'common/tls.cpp',
'common/tls.h',
'common/utilities.cpp',
'common/utilities.h',
'common/version.h',
'compiler/translator/BaseTypes.h',
'compiler/translator/BuiltInFunctionEmulator.cpp',
'compiler/translator/BuiltInFunctionEmulator.h',
'compiler/translator/CodeGen.cpp',
'compiler/translator/Common.h',
'compiler/translator/Compiler.cpp',
'compiler/translator/Compiler.h',
'compiler/translator/ConstantUnion.h',
'compiler/translator/DetectCallDepth.cpp',
'compiler/translator/DetectCallDepth.h',
'compiler/translator/DetectDiscontinuity.cpp',
'compiler/translator/DetectDiscontinuity.h',
'compiler/translator/Diagnostics.cpp',
'compiler/translator/Diagnostics.h',
'compiler/translator/DirectiveHandler.cpp',
'compiler/translator/DirectiveHandler.h',
'compiler/translator/ExtensionBehavior.h',
'compiler/translator/FlagStd140Structs.cpp',
'compiler/translator/FlagStd140Structs.h',
'compiler/translator/ForLoopUnroll.cpp',
'compiler/translator/ForLoopUnroll.h',
'compiler/translator/HashNames.h',
'compiler/translator/InfoSink.cpp',
'compiler/translator/InfoSink.h',
'compiler/translator/Initialize.cpp',
'compiler/translator/Initialize.h',
'compiler/translator/InitializeDll.cpp',
'compiler/translator/InitializeDll.h',
'compiler/translator/InitializeGlobals.h',
'compiler/translator/InitializeParseContext.cpp',
'compiler/translator/InitializeParseContext.h',
'compiler/translator/InitializeVariables.cpp',
'compiler/translator/InitializeVariables.h',
'compiler/translator/IntermTraverse.cpp',
'compiler/translator/Intermediate.cpp',
'compiler/translator/LoopInfo.cpp',
'compiler/translator/LoopInfo.h',
'compiler/translator/MMap.h',
'compiler/translator/NodeSearch.h',
'compiler/translator/OutputESSL.cpp',
'compiler/translator/OutputESSL.h',
'compiler/translator/OutputGLSL.cpp',
'compiler/translator/OutputGLSL.h',
'compiler/translator/OutputGLSLBase.cpp',
'compiler/translator/OutputGLSLBase.h',
'compiler/translator/OutputHLSL.cpp',
'compiler/translator/OutputHLSL.h',
'compiler/translator/ParseContext.cpp',
'compiler/translator/ParseContext.h',
'compiler/translator/PoolAlloc.cpp',
'compiler/translator/PoolAlloc.h',
'compiler/translator/Pragma.h',
'compiler/translator/QualifierAlive.cpp',
'compiler/translator/QualifierAlive.h',
'compiler/translator/RemoveTree.cpp',
'compiler/translator/RemoveTree.h',
'compiler/translator/RenameFunction.h',
'compiler/translator/RewriteElseBlocks.cpp',
'compiler/translator/RewriteElseBlocks.h',
'compiler/translator/ScalarizeVecAndMatConstructorArgs.cpp',
'compiler/translator/ScalarizeVecAndMatConstructorArgs.h',
'compiler/translator/SearchSymbol.cpp',
'compiler/translator/SearchSymbol.h',
'compiler/translator/StructureHLSL.cpp',
'compiler/translator/StructureHLSL.h',
'compiler/translator/SymbolTable.cpp',
'compiler/translator/SymbolTable.h',
'compiler/translator/TranslatorESSL.cpp',
'compiler/translator/TranslatorESSL.h',
'compiler/translator/TranslatorGLSL.cpp',
'compiler/translator/TranslatorGLSL.h',
'compiler/translator/TranslatorHLSL.cpp',
'compiler/translator/TranslatorHLSL.h',
'compiler/translator/Types.cpp',
'compiler/translator/Types.h',
'compiler/translator/UnfoldShortCircuit.cpp',
'compiler/translator/UnfoldShortCircuit.h',
'compiler/translator/UnfoldShortCircuitAST.cpp',
'compiler/translator/UnfoldShortCircuitAST.h',
'compiler/translator/UniformHLSL.cpp',
'compiler/translator/UniformHLSL.h',
'compiler/translator/UtilsHLSL.cpp',
'compiler/translator/UtilsHLSL.h',
'compiler/translator/ValidateLimitations.cpp',
'compiler/translator/ValidateLimitations.h',
'compiler/translator/ValidateOutputs.cpp',
'compiler/translator/ValidateOutputs.h',
'compiler/translator/VariableInfo.cpp',
'compiler/translator/VariableInfo.h',
'compiler/translator/VariablePacker.cpp',
'compiler/translator/VariablePacker.h',
'compiler/translator/VersionGLSL.cpp',
'compiler/translator/VersionGLSL.h',
'compiler/translator/compilerdebug.cpp',
'compiler/translator/compilerdebug.h',
'compiler/translator/depgraph/DependencyGraph.cpp',
'compiler/translator/depgraph/DependencyGraph.h',
'compiler/translator/depgraph/DependencyGraphBuilder.cpp',
'compiler/translator/depgraph/DependencyGraphBuilder.h',
'compiler/translator/depgraph/DependencyGraphOutput.cpp',
'compiler/translator/depgraph/DependencyGraphOutput.h',
'compiler/translator/depgraph/DependencyGraphTraverse.cpp',
'compiler/translator/glslang.h',
'compiler/translator/glslang.l',
'compiler/translator/glslang.y',
'compiler/translator/glslang_lex.cpp',
'compiler/translator/glslang_tab.cpp',
'compiler/translator/glslang_tab.h',
'compiler/translator/intermOut.cpp',
'compiler/translator/intermediate.h',
'compiler/translator/length_limits.h',
'compiler/translator/localintermediate.h',
'compiler/translator/parseConst.cpp',
'compiler/translator/timing/RestrictFragmentShaderTiming.cpp',
'compiler/translator/timing/RestrictFragmentShaderTiming.h',
'compiler/translator/timing/RestrictVertexShaderTiming.cpp',
'compiler/translator/timing/RestrictVertexShaderTiming.h',
'compiler/translator/util.cpp',
'compiler/translator/util.h',
'third_party/compiler/ArrayBoundsClamper.cpp',
'third_party/compiler/ArrayBoundsClamper.h',
],
'angle_preprocessor_sources':
[
'compiler/preprocessor/DiagnosticsBase.cpp',
'compiler/preprocessor/DiagnosticsBase.h',
'compiler/preprocessor/DirectiveHandlerBase.cpp',
'compiler/preprocessor/DirectiveHandlerBase.h',
'compiler/preprocessor/DirectiveParser.cpp',
'compiler/preprocessor/DirectiveParser.h',
'compiler/preprocessor/ExpressionParser.cpp',
'compiler/preprocessor/ExpressionParser.h',
'compiler/preprocessor/ExpressionParser.y',
'compiler/preprocessor/Input.cpp',
'compiler/preprocessor/Input.h',
'compiler/preprocessor/Lexer.cpp',
'compiler/preprocessor/Lexer.h',
'compiler/preprocessor/Macro.cpp',
'compiler/preprocessor/Macro.h',
'compiler/preprocessor/MacroExpander.cpp',
'compiler/preprocessor/MacroExpander.h',
'compiler/preprocessor/Preprocessor.cpp',
'compiler/preprocessor/Preprocessor.h',
'compiler/preprocessor/SourceLocation.h',
'compiler/preprocessor/Token.cpp',
'compiler/preprocessor/Token.h',
'compiler/preprocessor/Tokenizer.cpp',
'compiler/preprocessor/Tokenizer.h',
'compiler/preprocessor/Tokenizer.l',
'compiler/preprocessor/numeric_lex.h',
'compiler/preprocessor/pp_utils.h',
],
},
# Everything below this is duplicated in the GN build. If you change
# anything also change angle/BUILD.gn
'targets': 'targets':
[ [
{ {
'target_name': 'preprocessor', 'target_name': 'preprocessor',
'type': 'static_library', 'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ], 'includes': [ '../build/common_defines.gypi', ],
'sources': [ '<!@(python <(angle_path)/enumerate_files.py compiler/preprocessor -types *.cpp *.h *.y *.l )' ], 'sources': [ '<@(angle_preprocessor_sources)', ],
}, },
{ {
'target_name': 'translator_lib', 'target_name': 'translator_lib',
...@@ -23,10 +213,7 @@ ...@@ -23,10 +213,7 @@
], ],
'sources': 'sources':
[ [
'<!@(python <(angle_path)/enumerate_files.py \ '<@(angle_translator_lib_sources)',
-dirs compiler/translator third_party/compiler common ../include \
-excludes compiler/translator/ShaderLang.cpp \
-types *.cpp *.h *.y *.l)',
], ],
'msvs_settings': 'msvs_settings':
{ {
......
...@@ -3,6 +3,57 @@ ...@@ -3,6 +3,57 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'variables':
{
# This file list is shared with the GN build.
'angle_libegl_sources':
[
'../include/EGL/egl.h',
'../include/EGL/eglext.h',
'../include/EGL/eglplatform.h',
'../include/GLES2/gl2.h',
'../include/GLES2/gl2ext.h',
'../include/GLES2/gl2platform.h',
'../include/GLES3/gl3.h',
'../include/GLES3/gl3ext.h',
'../include/GLES3/gl3platform.h',
'../include/GLSLANG/ShaderLang.h',
'../include/KHR/khrplatform.h',
'../include/angle_gl.h',
'common/RefCountObject.cpp',
'common/RefCountObject.h',
'common/angleutils.h',
'common/blocklayout.cpp',
'common/blocklayout.h',
'common/debug.cpp',
'common/debug.h',
'common/event_tracer.cpp',
'common/event_tracer.h',
'common/mathutil.cpp',
'common/mathutil.h',
'common/platform.h',
'common/shadervars.h',
'common/tls.cpp',
'common/tls.h',
'common/utilities.cpp',
'common/utilities.h',
'common/version.h',
'libEGL/Config.cpp',
'libEGL/Config.h',
'libEGL/Display.cpp',
'libEGL/Display.h',
'libEGL/Surface.cpp',
'libEGL/Surface.h',
'libEGL/libEGL.cpp',
'libEGL/libEGL.def',
'libEGL/libEGL.rc',
'libEGL/main.cpp',
'libEGL/main.h',
'libEGL/resource.h',
],
},
# Everything below this is duplicated in the GN build. If you change
# anything also change angle/BUILD.gn
'conditions': 'conditions':
[ [
['OS=="win"', ['OS=="win"',
...@@ -21,9 +72,7 @@ ...@@ -21,9 +72,7 @@
], ],
'sources': 'sources':
[ [
'<!@(python <(angle_path)/enumerate_files.py \ '<@(angle_libegl_sources)',
-dirs common libEGL ../include \
-types *.cpp *.h *.def *.rc)',
], ],
'defines': 'defines':
[ [
......
...@@ -7,15 +7,289 @@ ...@@ -7,15 +7,289 @@
{ {
'angle_enable_d3d9%': 1, 'angle_enable_d3d9%': 1,
'angle_enable_d3d11%': 1, 'angle_enable_d3d11%': 1,
}, # These file lists are shared with the GN build.
'target_defaults': 'angle_libglesv2_sources':
{ [
'defines': '../include/EGL/egl.h',
'../include/EGL/eglext.h',
'../include/EGL/eglplatform.h',
'../include/GLES2/gl2.h',
'../include/GLES2/gl2ext.h',
'../include/GLES2/gl2platform.h',
'../include/GLES3/gl3.h',
'../include/GLES3/gl3ext.h',
'../include/GLES3/gl3platform.h',
'../include/GLSLANG/ShaderLang.h',
'../include/KHR/khrplatform.h',
'../include/angle_gl.h',
'common/RefCountObject.cpp',
'common/RefCountObject.h',
'common/angleutils.h',
'common/blocklayout.cpp',
'common/blocklayout.h',
'common/debug.cpp',
'common/debug.h',
'common/event_tracer.cpp',
'common/event_tracer.h',
'common/mathutil.cpp',
'common/mathutil.h',
'common/platform.h',
'common/shadervars.h',
'common/tls.cpp',
'common/tls.h',
'common/utilities.cpp',
'common/utilities.h',
'common/version.h',
'libGLESv2/BinaryStream.h',
'libGLESv2/Buffer.cpp',
'libGLESv2/Buffer.h',
'libGLESv2/Caps.cpp',
'libGLESv2/Caps.h',
'libGLESv2/Context.cpp',
'libGLESv2/Context.h',
'libGLESv2/DynamicHLSL.cpp',
'libGLESv2/DynamicHLSL.h',
'libGLESv2/Fence.cpp',
'libGLESv2/Fence.h',
'libGLESv2/Float16ToFloat32.cpp',
'libGLESv2/Framebuffer.cpp',
'libGLESv2/Framebuffer.h',
'libGLESv2/FramebufferAttachment.cpp',
'libGLESv2/FramebufferAttachment.h',
'libGLESv2/HandleAllocator.cpp',
'libGLESv2/HandleAllocator.h',
'libGLESv2/Program.cpp',
'libGLESv2/Program.h',
'libGLESv2/ProgramBinary.cpp',
'libGLESv2/ProgramBinary.h',
'libGLESv2/Query.cpp',
'libGLESv2/Query.h',
'libGLESv2/Renderbuffer.cpp',
'libGLESv2/Renderbuffer.h',
'libGLESv2/ResourceManager.cpp',
'libGLESv2/ResourceManager.h',
'libGLESv2/Sampler.cpp',
'libGLESv2/Sampler.h',
'libGLESv2/Shader.cpp',
'libGLESv2/Shader.h',
'libGLESv2/State.cpp',
'libGLESv2/State.h',
'libGLESv2/Texture.cpp',
'libGLESv2/Texture.h',
'libGLESv2/TransformFeedback.cpp',
'libGLESv2/TransformFeedback.h',
'libGLESv2/Uniform.cpp',
'libGLESv2/Uniform.h',
'libGLESv2/VertexArray.cpp',
'libGLESv2/VertexArray.h',
'libGLESv2/VertexAttribute.cpp',
'libGLESv2/VertexAttribute.h',
'libGLESv2/angletypes.cpp',
'libGLESv2/angletypes.h',
'libGLESv2/constants.h',
'libGLESv2/formatutils.cpp',
'libGLESv2/formatutils.h',
'libGLESv2/libGLESv2.cpp',
'libGLESv2/libGLESv2.def',
'libGLESv2/libGLESv2.rc',
'libGLESv2/main.cpp',
'libGLESv2/main.h',
'libGLESv2/precompiled.cpp',
'libGLESv2/precompiled.h',
'libGLESv2/queryconversions.cpp',
'libGLESv2/queryconversions.h',
'libGLESv2/renderer/BufferImpl.h',
'libGLESv2/renderer/FenceImpl.h',
'libGLESv2/renderer/Image.cpp',
'libGLESv2/renderer/Image.h',
'libGLESv2/renderer/IndexRangeCache.cpp',
'libGLESv2/renderer/IndexRangeCache.h',
'libGLESv2/renderer/QueryImpl.h',
'libGLESv2/renderer/RenderTarget.h',
'libGLESv2/renderer/Renderer.cpp',
'libGLESv2/renderer/Renderer.h',
'libGLESv2/renderer/ShaderExecutable.h',
'libGLESv2/renderer/SwapChain.h',
'libGLESv2/renderer/TextureImpl.h',
'libGLESv2/renderer/VertexArrayImpl.h',
'libGLESv2/renderer/copyimage.cpp',
'libGLESv2/renderer/copyimage.h',
'libGLESv2/renderer/copyvertex.h',
'libGLESv2/renderer/generatemip.h',
'libGLESv2/renderer/generatemip.inl',
'libGLESv2/renderer/imageformats.h',
'libGLESv2/renderer/loadimage.cpp',
'libGLESv2/renderer/loadimage.h',
'libGLESv2/renderer/loadimage.inl',
'libGLESv2/renderer/loadimageSSE2.cpp',
'libGLESv2/renderer/vertexconversion.h',
'libGLESv2/resource.h',
'libGLESv2/validationES.cpp',
'libGLESv2/validationES.h',
'libGLESv2/validationES2.cpp',
'libGLESv2/validationES2.h',
'libGLESv2/validationES3.cpp',
'libGLESv2/validationES3.h',
'third_party/murmurhash/MurmurHash3.cpp',
'third_party/murmurhash/MurmurHash3.h',
'third_party/systeminfo/SystemInfo.cpp',
'third_party/systeminfo/SystemInfo.h',
],
'angle_d3d_shared_sources':
[ [
'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }', 'libGLESv2/renderer/d3d/BufferD3D.cpp',
'libGLESv2/renderer/d3d/BufferD3D.h',
'libGLESv2/renderer/d3d/HLSLCompiler.cpp',
'libGLESv2/renderer/d3d/HLSLCompiler.h',
'libGLESv2/renderer/d3d/ImageD3D.cpp',
'libGLESv2/renderer/d3d/ImageD3D.h',
'libGLESv2/renderer/d3d/IndexBuffer.cpp',
'libGLESv2/renderer/d3d/IndexBuffer.h',
'libGLESv2/renderer/d3d/IndexDataManager.cpp',
'libGLESv2/renderer/d3d/IndexDataManager.h',
'libGLESv2/renderer/d3d/TextureD3D.cpp',
'libGLESv2/renderer/d3d/TextureD3D.h',
'libGLESv2/renderer/d3d/TextureStorage.cpp',
'libGLESv2/renderer/d3d/TextureStorage.h',
'libGLESv2/renderer/d3d/VertexBuffer.cpp',
'libGLESv2/renderer/d3d/VertexBuffer.h',
'libGLESv2/renderer/d3d/VertexDataManager.cpp',
'libGLESv2/renderer/d3d/VertexDataManager.h',
], ],
'angle_d3d9_sources':
[
'libGLESv2/renderer/d3d/d3d9/Blit9.cpp',
'libGLESv2/renderer/d3d/d3d9/Blit9.h',
'libGLESv2/renderer/d3d/d3d9/Buffer9.cpp',
'libGLESv2/renderer/d3d/d3d9/Buffer9.h',
'libGLESv2/renderer/d3d/d3d9/Fence9.cpp',
'libGLESv2/renderer/d3d/d3d9/Fence9.h',
'libGLESv2/renderer/d3d/d3d9/formatutils9.cpp',
'libGLESv2/renderer/d3d/d3d9/formatutils9.h',
'libGLESv2/renderer/d3d/d3d9/Image9.cpp',
'libGLESv2/renderer/d3d/d3d9/Image9.h',
'libGLESv2/renderer/d3d/d3d9/IndexBuffer9.cpp',
'libGLESv2/renderer/d3d/d3d9/IndexBuffer9.h',
'libGLESv2/renderer/d3d/d3d9/Query9.cpp',
'libGLESv2/renderer/d3d/d3d9/Query9.h',
'libGLESv2/renderer/d3d/d3d9/Renderer9.cpp',
'libGLESv2/renderer/d3d/d3d9/Renderer9.h',
'libGLESv2/renderer/d3d/d3d9/renderer9_utils.cpp',
'libGLESv2/renderer/d3d/d3d9/renderer9_utils.h',
'libGLESv2/renderer/d3d/d3d9/RenderTarget9.cpp',
'libGLESv2/renderer/d3d/d3d9/RenderTarget9.h',
'libGLESv2/renderer/d3d/d3d9/ShaderCache.h',
'libGLESv2/renderer/d3d/d3d9/ShaderExecutable9.cpp',
'libGLESv2/renderer/d3d/d3d9/shaders/compiled/componentmaskps.h',
'libGLESv2/renderer/d3d/d3d9/shaders/compiled/flipyvs.h',
'libGLESv2/renderer/d3d/d3d9/shaders/compiled/luminanceps.h',
'libGLESv2/renderer/d3d/d3d9/shaders/compiled/passthroughps.h',
'libGLESv2/renderer/d3d/d3d9/shaders/compiled/standardvs.h',
'libGLESv2/renderer/d3d/d3d9/SwapChain9.cpp',
'libGLESv2/renderer/d3d/d3d9/SwapChain9.h',
'libGLESv2/renderer/d3d/d3d9/TextureStorage9.cpp',
'libGLESv2/renderer/d3d/d3d9/TextureStorage9.h',
'libGLESv2/renderer/d3d/d3d9/VertexArray9.h',
'libGLESv2/renderer/d3d/d3d9/VertexBuffer9.cpp',
'libGLESv2/renderer/d3d/d3d9/VertexBuffer9.h',
'libGLESv2/renderer/d3d/d3d9/VertexDeclarationCache.cpp',
'libGLESv2/renderer/d3d/d3d9/VertexDeclarationCache.h',
],
'angle_d3d11_sources':
[
'libGLESv2/renderer/d3d/d3d11/Blit11.cpp',
'libGLESv2/renderer/d3d/d3d11/Blit11.h',
'libGLESv2/renderer/d3d/d3d11/Buffer11.cpp',
'libGLESv2/renderer/d3d/d3d11/Buffer11.h',
'libGLESv2/renderer/d3d/d3d11/Clear11.cpp',
'libGLESv2/renderer/d3d/d3d11/Clear11.h',
'libGLESv2/renderer/d3d/d3d11/Fence11.cpp',
'libGLESv2/renderer/d3d/d3d11/Fence11.h',
'libGLESv2/renderer/d3d/d3d11/formatutils11.cpp',
'libGLESv2/renderer/d3d/d3d11/formatutils11.h',
'libGLESv2/renderer/d3d/d3d11/Image11.cpp',
'libGLESv2/renderer/d3d/d3d11/Image11.h',
'libGLESv2/renderer/d3d/d3d11/IndexBuffer11.cpp',
'libGLESv2/renderer/d3d/d3d11/IndexBuffer11.h',
'libGLESv2/renderer/d3d/d3d11/InputLayoutCache.cpp',
'libGLESv2/renderer/d3d/d3d11/InputLayoutCache.h',
'libGLESv2/renderer/d3d/d3d11/PixelTransfer11.cpp',
'libGLESv2/renderer/d3d/d3d11/PixelTransfer11.h',
'libGLESv2/renderer/d3d/d3d11/Query11.cpp',
'libGLESv2/renderer/d3d/d3d11/Query11.h',
'libGLESv2/renderer/d3d/d3d11/Renderer11.cpp',
'libGLESv2/renderer/d3d/d3d11/Renderer11.h',
'libGLESv2/renderer/d3d/d3d11/renderer11_utils.cpp',
'libGLESv2/renderer/d3d/d3d11/renderer11_utils.h',
'libGLESv2/renderer/d3d/d3d11/RenderStateCache.cpp',
'libGLESv2/renderer/d3d/d3d11/RenderStateCache.h',
'libGLESv2/renderer/d3d/d3d11/RenderTarget11.cpp',
'libGLESv2/renderer/d3d/d3d11/RenderTarget11.h',
'libGLESv2/renderer/d3d/d3d11/ShaderExecutable11.cpp',
'libGLESv2/renderer/d3d/d3d11/ShaderExecutable11.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearfloat11vs.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearsint11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearsint11vs.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearuint11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearuint11vs.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzlef2darrayps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzlef3dps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzlei2darrayps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzlei3dps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzleui2darrayps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzleui2dps.h',
'libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzleui3dps.h',
'libGLESv2/renderer/d3d/d3d11/SwapChain11.cpp',
'libGLESv2/renderer/d3d/d3d11/SwapChain11.h',
'libGLESv2/renderer/d3d/d3d11/TextureStorage11.cpp',
'libGLESv2/renderer/d3d/d3d11/TextureStorage11.h',
'libGLESv2/renderer/d3d/d3d11/VertexArray11.h',
'libGLESv2/renderer/d3d/d3d11/VertexBuffer11.cpp',
'libGLESv2/renderer/d3d/d3d11/VertexBuffer11.h',
]
}, },
# Everything below this is duplicated in the GN build. If you change
# anything also change angle/BUILD.gn
'conditions': 'conditions':
[ [
['OS=="win"', ['OS=="win"',
...@@ -35,26 +309,29 @@ ...@@ -35,26 +309,29 @@
], ],
'sources': 'sources':
[ [
'<!@(python <(angle_path)/enumerate_files.py \ '<@(angle_libglesv2_sources)',
-dirs common libGLESv2 third_party/murmurhash ../include third_party/systeminfo \
-types *.cpp *.h *.inl *.hlsl *.vs *.ps *.bat *.def *.rc \
-excludes */d3d/*)',
], ],
'defines': 'defines':
[ [
'GL_APICALL=', 'GL_APICALL=',
'GL_GLEXT_PROTOTYPES=', 'GL_GLEXT_PROTOTYPES=',
'EGLAPI=', 'EGLAPI=',
'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }',
], ],
'conditions': 'conditions':
[ [
['angle_enable_d3d9==1 or angle_enable_d3d11==1',
{
'sources':
[
'<@(angle_d3d_shared_sources)',
],
}],
['angle_enable_d3d9==1', ['angle_enable_d3d9==1',
{ {
'sources': 'sources':
[ [
'<!@(python <(angle_path)/enumerate_files.py \ '<@(angle_d3d9_sources)',
-dirs libGLESv2/renderer/d3d libGLESv2/renderer/d3d/d3d9 \
-types *.cpp *.h *.inl *.vs *.ps *.bat)',
], ],
'defines': 'defines':
[ [
...@@ -75,9 +352,7 @@ ...@@ -75,9 +352,7 @@
{ {
'sources': 'sources':
[ [
'<!@(python <(angle_path)/enumerate_files.py \ '<@(angle_d3d11_sources)',
-dirs libGLESv2/renderer/d3d libGLESv2/renderer/d3d/d3d/d3d11 \
-types *.cpp *.h *.inl *.hlsl *.bat)',
], ],
'defines': 'defines':
[ [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment