Skip to content

S
swiftshader
Commit fe23c66f by Jamie Madill
Options

Fix GN Header checks.

This fixes a few missing dependencies for the Chromium uses of SwiftShader. It will allow us to turn on the 'gn check' in Chromium. Bug: angleproject:3876 Bug: b/140251624 Change-Id: I875a59701a4437cf94b503f6430d858a5285a961 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35811Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 39a9f1bd
Showing with 147 additions and 88 deletions
src/Device/BUILD.gn
...@@ -14,44 +14,60 @@ ...@@ -14,44 +14,60 @@
import("../swiftshader.gni") import("../swiftshader.gni")
swiftshader_source_set("Device") { swiftshader_source_set("Device_headers") {
sources = [ sources = [
"Blitter.cpp",
"Blitter.hpp", "Blitter.hpp",
"Clipper.cpp",
"Clipper.hpp", "Clipper.hpp",
"Color.cpp",
"Color.hpp", "Color.hpp",
"Config.cpp",
"Config.hpp", "Config.hpp",
"Context.cpp",
"Context.hpp", "Context.hpp",
"ETC_Decoder.cpp",
"ETC_Decoder.hpp", "ETC_Decoder.hpp",
"Matrix.cpp",
"Matrix.hpp", "Matrix.hpp",
"Memset.hpp", "Memset.hpp",
"PixelProcessor.cpp",
"PixelProcessor.hpp", "PixelProcessor.hpp",
"Plane.cpp",
"Plane.hpp", "Plane.hpp",
"Point.cpp",
"Point.hpp", "Point.hpp",
"QuadRasterizer.cpp",
"QuadRasterizer.hpp", "QuadRasterizer.hpp",
"Renderer.cpp",
"Renderer.hpp", "Renderer.hpp",
"SetupProcessor.cpp",
"SetupProcessor.hpp", "SetupProcessor.hpp",
"Vector.cpp",
"Vector.hpp", "Vector.hpp",
"VertexProcessor.cpp",
"VertexProcessor.hpp", "VertexProcessor.hpp",
] ]
}
swiftshader_source_set("Device") {
sources = [
"Blitter.cpp",
"Clipper.cpp",
"Color.cpp",
"Config.cpp",
"Context.cpp",
"ETC_Decoder.cpp",
"Matrix.cpp",
"PixelProcessor.cpp",
"Plane.cpp",
"Point.cpp",
"QuadRasterizer.cpp",
"Renderer.cpp",
"SetupProcessor.cpp",
"Vector.cpp",
"VertexProcessor.cpp",
]
include_dirs = [ include_dirs = [
"..", "..",
"../../include", "../../include",
"../../third_party/SPIRV-Headers/include", "../../third_party/SPIRV-Headers/include",
] ]
deps = [
"../Pipeline:Pipeline_headers",
"../System:System_headers",
"../Vulkan:swiftshader_libvulkan_headers",
"../Yarn:Yarn_headers",
]
public_deps = [
":Device_headers",
]
} }
src/Pipeline/BUILD.gn
...@@ -14,32 +14,35 @@ ...@@ -14,32 +14,35 @@
import("../swiftshader.gni") import("../swiftshader.gni")
swiftshader_source_set("Pipeline_headers") {
sources = [
"ComputeProgram.hpp",
"Constants.hpp",
"PixelProgram.hpp",
"PixelRoutine.hpp",
"SamplerCore.hpp",
"SetupRoutine.hpp",
"ShaderCore.hpp",
"SpirvShader.hpp",
"VertexProgram.hpp",
"VertexRoutine.hpp",
]
}
swiftshader_source_set("Pipeline") { swiftshader_source_set("Pipeline") {
sources = [ sources = [
"ComputeProgram.cpp", "ComputeProgram.cpp",
"ComputeProgram.hpp",
"Constants.cpp", "Constants.cpp",
"Constants.hpp",
"PixelProgram.cpp", "PixelProgram.cpp",
"PixelProgram.hpp",
"PixelRoutine.cpp", "PixelRoutine.cpp",
"PixelRoutine.hpp",
"SamplerCore.cpp", "SamplerCore.cpp",
"SamplerCore.hpp",
"SetupRoutine.cpp", "SetupRoutine.cpp",
"SetupRoutine.hpp",
"ShaderCore.cpp", "ShaderCore.cpp",
"ShaderCore.hpp",
"SpirvShader.cpp", "SpirvShader.cpp",
"SpirvShader.hpp",
"SpirvShaderSampling.cpp", "SpirvShaderSampling.cpp",
"SpirvShaderSampling.hpp",
"SpirvShader_dbg.cpp", "SpirvShader_dbg.cpp",
"SpirvShader_dbg.hpp",
"VertexProgram.cpp", "VertexProgram.cpp",
"VertexProgram.hpp",
"VertexRoutine.cpp", "VertexRoutine.cpp",
"VertexRoutine.hpp",
] ]
include_dirs = [ include_dirs = [
...@@ -47,4 +50,15 @@ swiftshader_source_set("Pipeline") { ...@@ -47,4 +50,15 @@ swiftshader_source_set("Pipeline") {
"../../include", "../../include",
"../../third_party/SPIRV-Headers/include", "../../third_party/SPIRV-Headers/include",
] ]
deps = [
"../Device:Device_headers",
"../System:System_headers",
"../Vulkan:swiftshader_libvulkan_headers",
"../Yarn:Yarn_headers",
]
public_deps = [
":Pipeline_headers",
]
} }
src/System/BUILD.gn
...@@ -14,26 +14,34 @@ ...@@ -14,26 +14,34 @@
import("../swiftshader.gni") import("../swiftshader.gni")
swiftshader_source_set("System") { swiftshader_source_set("System_headers") {
sources = [ sources = [
"Build.hpp", "Build.hpp",
"CPUID.cpp",
"CPUID.hpp", "CPUID.hpp",
"Configurator.cpp",
"Configurator.hpp", "Configurator.hpp",
"Debug.cpp",
"Debug.hpp", "Debug.hpp",
"Half.cpp",
"Half.hpp", "Half.hpp",
"Math.cpp",
"Math.hpp", "Math.hpp",
"Memory.cpp",
"Memory.hpp", "Memory.hpp",
"Socket.cpp", "Socket.cpp",
"Socket.hpp", "Socket.hpp",
"Timer.cpp",
"Timer.hpp", "Timer.hpp",
] ]
}
swiftshader_source_set("System") {
sources = [
"CPUID.cpp",
"Configurator.cpp",
"Debug.cpp",
"Half.cpp",
"Math.cpp",
"Memory.cpp",
"Timer.cpp",
]
include_dirs = [ ".." ] include_dirs = [ ".." ]
public_deps = [
":System_headers",
]
} }
src/Vulkan/BUILD.gn
...@@ -42,75 +42,80 @@ config("swiftshader_libvulkan_private_config") { ...@@ -42,75 +42,80 @@ config("swiftshader_libvulkan_private_config") {
] ]
} }
swiftshader_shared_library("swiftshader_libvulkan") { swiftshader_source_set("swiftshader_libvulkan_headers") {
sources = [ sources = [
"Version.h", "Version.h",
"VkBuffer.cpp",
"VkBuffer.hpp", "VkBuffer.hpp",
"VkBufferView.cpp",
"VkBufferView.hpp", "VkBufferView.hpp",
"VkCommandBuffer.cpp",
"VkCommandBuffer.hpp", "VkCommandBuffer.hpp",
"VkCommandPool.cpp",
"VkCommandPool.hpp", "VkCommandPool.hpp",
"VkConfig.h", "VkConfig.h",
"VkDebug.cpp",
"VkDebug.hpp", "VkDebug.hpp",
"VkDescriptorPool.cpp",
"VkDescriptorPool.hpp", "VkDescriptorPool.hpp",
"VkDescriptorSet.hpp", "VkDescriptorSet.hpp",
"VkDescriptorSetLayout.cpp",
"VkDescriptorSetLayout.hpp", "VkDescriptorSetLayout.hpp",
"VkDescriptorUpdateTemplate.cpp",
"VkDescriptorUpdateTemplate.hpp", "VkDescriptorUpdateTemplate.hpp",
"VkDestroy.h", "VkDestroy.h",
"VkDevice.cpp",
"VkDevice.hpp", "VkDevice.hpp",
"VkDeviceMemory.cpp",
"VkDeviceMemory.hpp", "VkDeviceMemory.hpp",
"VkEvent.hpp", "VkEvent.hpp",
"VkFence.hpp", "VkFence.hpp",
"VkFormat.cpp",
"VkFormat.h", "VkFormat.h",
"VkFramebuffer.cpp",
"VkFramebuffer.hpp", "VkFramebuffer.hpp",
"VkGetProcAddress.cpp",
"VkGetProcAddress.h", "VkGetProcAddress.h",
"VkImage.cpp",
"VkImage.hpp", "VkImage.hpp",
"VkImageView.cpp",
"VkImageView.hpp", "VkImageView.hpp",
"VkInstance.cpp",
"VkInstance.hpp", "VkInstance.hpp",
"VkMemory.cpp",
"VkMemory.h", "VkMemory.h",
"VkObject.hpp", "VkObject.hpp",
"VkPhysicalDevice.cpp",
"VkPhysicalDevice.hpp", "VkPhysicalDevice.hpp",
"VkPipeline.cpp",
"VkPipeline.hpp", "VkPipeline.hpp",
"VkPipelineCache.cpp",
"VkPipelineCache.hpp", "VkPipelineCache.hpp",
"VkPipelineLayout.cpp",
"VkPipelineLayout.hpp", "VkPipelineLayout.hpp",
"VkPromotedExtensions.cpp",
"VkQueryPool.cpp",
"VkQueryPool.hpp", "VkQueryPool.hpp",
"VkQueue.cpp",
"VkQueue.hpp", "VkQueue.hpp",
"VkRenderPass.cpp",
"VkRenderPass.hpp", "VkRenderPass.hpp",
"VkSampler.cpp",
"VkSampler.hpp", "VkSampler.hpp",
"VkSemaphore.hpp", "VkSemaphore.hpp",
"VkShaderModule.cpp",
"VkShaderModule.hpp", "VkShaderModule.hpp",
"Vulkan.rc",
"VulkanPlatform.h", "VulkanPlatform.h",
]
}
swiftshader_shared_library("swiftshader_libvulkan") {
sources = [
"VkBuffer.cpp",
"VkBufferView.cpp",
"VkCommandBuffer.cpp",
"VkCommandPool.cpp",
"VkDebug.cpp",
"VkDescriptorPool.cpp",
"VkDescriptorSetLayout.cpp",
"VkDescriptorUpdateTemplate.cpp",
"VkDevice.cpp",
"VkDeviceMemory.cpp",
"VkFormat.cpp",
"VkFramebuffer.cpp",
"VkGetProcAddress.cpp",
"VkImage.cpp",
"VkImageView.cpp",
"VkInstance.cpp",
"VkMemory.cpp",
"VkPhysicalDevice.cpp",
"VkPipeline.cpp",
"VkPipelineCache.cpp",
"VkPipelineLayout.cpp",
"VkPromotedExtensions.cpp",
"VkQueryPool.cpp",
"VkQueue.cpp",
"VkRenderPass.cpp",
"VkSampler.cpp",
"VkShaderModule.cpp",
"Vulkan.rc",
"libVulkan.cpp", "libVulkan.cpp",
"vk_swiftshader.def",
"main.cpp", "main.cpp",
"resource.h", "resource.h",
"vk_swiftshader.def",
] ]
configs = [ ":swiftshader_libvulkan_private_config" ] configs = [ ":swiftshader_libvulkan_private_config" ]
...@@ -133,13 +138,13 @@ swiftshader_shared_library("swiftshader_libvulkan") { ...@@ -133,13 +138,13 @@ swiftshader_shared_library("swiftshader_libvulkan") {
} }
deps = [ deps = [
"${swiftshader_spirv_tools_dir}:SPIRV-Tools",
"../Device", "../Device",
"../Pipeline", "../Pipeline",
"../Reactor:swiftshader_llvm_reactor", "../Reactor:swiftshader_llvm_reactor",
"../System", "../System",
"../WSI", "../WSI",
"../Yarn", "../Yarn",
"$swiftshader_spirv_tools_dir:SPIRV-Tools",
] ]
include_dirs = [ include_dirs = [
...@@ -148,4 +153,8 @@ swiftshader_shared_library("swiftshader_libvulkan") { ...@@ -148,4 +153,8 @@ swiftshader_shared_library("swiftshader_libvulkan") {
"$swiftshader_spirv_tools_dir/include", "$swiftshader_spirv_tools_dir/include",
"$spirv_tools_spirv_headers_dir/include", "$spirv_tools_spirv_headers_dir/include",
] ]
public_deps = [
":swiftshader_libvulkan_headers",
]
} }
src/WSI/BUILD.gn
...@@ -43,4 +43,8 @@ swiftshader_source_set("WSI") { ...@@ -43,4 +43,8 @@ swiftshader_source_set("WSI") {
"../../include", "../../include",
"../../third_party/SPIRV-Headers/include", "../../third_party/SPIRV-Headers/include",
] ]
deps = [
"../Vulkan:swiftshader_libvulkan_headers",
]
} }
src/Yarn/BUILD.gn
...@@ -14,51 +14,58 @@ ...@@ -14,51 +14,58 @@
import("../swiftshader.gni") import("../swiftshader.gni")
swiftshader_source_set("Yarn") { swiftshader_source_set("Yarn_headers") {
sources = [ sources = [
"ConditionVariable.hpp", "ConditionVariable.hpp",
"Containers.hpp", "Containers.hpp",
"Debug.cpp",
"Debug.hpp", "Debug.hpp",
"Defer.hpp", "Defer.hpp",
"Finally.hpp", "Finally.hpp",
"OSFiber.hpp", "OSFiber.hpp",
"Pool.hpp", "Pool.hpp",
"SAL.hpp", "SAL.hpp",
"Scheduler.cpp",
"Scheduler.hpp", "Scheduler.hpp",
"Thread.cpp",
"Thread.hpp", "Thread.hpp",
"Ticket.hpp", "Ticket.hpp",
"Trace.cpp",
"Trace.hpp", "Trace.hpp",
"Utils.hpp", "Utils.hpp",
"WaitGroup.hpp", "WaitGroup.hpp",
] ]
if (is_win) { if (is_win) {
sources += [ sources += [ "OSFiber_windows.hpp" ]
"OSFiber_windows.hpp", }
] }
} else {
swiftshader_source_set("Yarn") {
sources = [
"Debug.cpp",
"Scheduler.cpp",
"Thread.cpp",
"Trace.cpp",
]
if (!is_win) {
sources += [ sources += [
"OSFiber_aarch64.c", "OSFiber_aarch64.c",
"OSFiber_asm_aarch64.h",
"OSFiber_asm_aarch64.S",
"OSFiber_arm.c", "OSFiber_arm.c",
"OSFiber_asm_arm.h",
"OSFiber_asm_arm.S",
"OSFiber_asm.hpp", "OSFiber_asm.hpp",
"OSFiber_x64.c", "OSFiber_asm_aarch64.S",
"OSFiber_asm_x64.h", "OSFiber_asm_aarch64.h",
"OSFiber_asm_arm.S",
"OSFiber_asm_arm.h",
"OSFiber_asm_x64.S", "OSFiber_asm_x64.S",
"OSFiber_x86.c", "OSFiber_asm_x64.h",
"OSFiber_asm_x86.h",
"OSFiber_asm_x86.S", "OSFiber_asm_x86.S",
"OSFiber_asm_x86.h",
"OSFiber_x64.c",
"OSFiber_x86.c",
] ]
} }
include_dirs = [ include_dirs = [ ".." ]
"..",
public_deps = [
":Yarn_headers",
] ]
} }
tests/GLESUnitTests/BUILD.gn
...@@ -22,6 +22,8 @@ if (build_with_chromium) { ...@@ -22,6 +22,8 @@ if (build_with_chromium) {
"//base/test:test_support", "//base/test:test_support",
"//testing/gmock", "//testing/gmock",
"//testing/gtest", "//testing/gtest",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest",
"//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL", "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL",
"//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2", "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
] ]
...@@ -60,4 +62,4 @@ if (build_with_chromium) { ...@@ -60,4 +62,4 @@ if (build_with_chromium) {
ldflags = [ "-Wl,-rpath=\$ORIGIN/swiftshader" ] ldflags = [ "-Wl,-rpath=\$ORIGIN/swiftshader" ]
} }
} }
} }
\ No newline at end of file
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