Skip to content

S
swiftshader
Commit e2c7154e by Alexis Hetu Committed by Alexis Hétu
Options

Cleaning up BUILD.gn file before Chromium DEPS update

Cleaned up a few things before updating SwiftShader's version in Chromium's DEPS file: - Added Windows Subzero fix - Removed commented out sysroot related lines - Fixed formatting using git - Temporarily disabled Subzero compilation for now Change-Id: Ib6ae75c20869522675d28086ab170f01fd730f93 Reviewed-on: https://swiftshader-review.googlesource.com/8709Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 8560e687
Showing with 12 additions and 6 deletions
src/Reactor/BUILD.gn
...@@ -25,6 +25,10 @@ config("swiftshader_subzero_common_private_config") { ...@@ -25,6 +25,10 @@ config("swiftshader_subzero_common_private_config") {
"ICE_THREAD_LOCAL_HACK=0", "ICE_THREAD_LOCAL_HACK=0",
] ]
if (is_win) {
defines += [ "SUBZERO_USE_MICROSOFT_ABI" ]
}
if (target_cpu == "x64") { if (target_cpu == "x64") {
defines += [ defines += [
"SZTARGET=X8664", "SZTARGET=X8664",
...@@ -53,7 +57,6 @@ config("swiftshader_subzero_common_private_config") { ...@@ -53,7 +57,6 @@ config("swiftshader_subzero_common_private_config") {
} }
config("swiftshader_subzero_private_config") { config("swiftshader_subzero_private_config") {
# cflags_cc = [ "--sysroot=/" ] #FIXME
cflags = [] cflags = []
if (is_win) { if (is_win) {
...@@ -93,7 +96,6 @@ config("swiftshader_subzero_private_config") { ...@@ -93,7 +96,6 @@ config("swiftshader_subzero_private_config") {
} }
config("swiftshader_reactor_with_subzero_private_config") { config("swiftshader_reactor_with_subzero_private_config") {
# cflags_cc = [ "--sysroot=/" ] #FIXME
cflags = [] cflags = []
if (is_win) { if (is_win) {
...@@ -232,15 +234,19 @@ source_set("swiftshader_subzero") { ...@@ -232,15 +234,19 @@ source_set("swiftshader_subzero") {
} }
source_set("swiftshader_reactor") { source_set("swiftshader_reactor") {
deps = [ "../OpenGL/common:swiftshader_opengl_common" ] deps = [
"../OpenGL/common:swiftshader_opengl_common",
]
sources = [ "Routine.cpp" ] sources = [
"Routine.cpp",
]
# Currently, Subzero will only be used on Windows # Currently, Subzero will only be used on Windows
# LLVM will be used on Linux and MacOS # LLVM will be used on Linux and MacOS
use_subzero = is_win use_subzero = false
if(use_subzero) { if (use_subzero) {
deps += [ ":swiftshader_subzero" ] deps += [ ":swiftshader_subzero" ]
sources += [ sources += [
......
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