OSDN Git Service

[ozone] swiftshader ozone
authorMustafa Çamurcu <camurcu@google.com>
Fri, 23 Mar 2018 20:39:02 +0000 (16:39 -0400)
committerMustafa Çamurcu <camurcu@google.com>
Wed, 4 Apr 2018 15:35:38 +0000 (15:35 +0000)
Windows implementation for FrameBuffer needs priority over Ozone.

When building Chrome for Windows using Ozone, since use_ozone=true,
some required windows definitions don't get defined.

Change-Id: I6b8475c036dc88f7e3cb118a7db286afc75857fe
Reviewed-on: https://swiftshader-review.googlesource.com/17968
Tested-by: Mustafa Çamurcu <camurcu@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
src/Main/BUILD.gn

index 99882a9..3641a76 100644 (file)
@@ -47,7 +47,7 @@ swiftshader_source_set("swiftshader_main") {
     "SwiftConfig.cpp",
   ]
 
-  if (use_ozone) {
+  if (use_ozone && !is_win) {
     sources += [ "FrameBufferOzone.cpp" ]
   } else if (is_linux) {
     sources += [
@@ -70,9 +70,7 @@ swiftshader_source_set("swiftshader_main") {
 
   configs = [ ":swiftshader_main_private_config" ]
 
-  include_dirs = [
-    "..",
-  ]
+  include_dirs = [ ".." ]
 
   if (is_mac) {
     include_dirs += [ "../../include" ]