commit 2b5420c07f9f3fa453f3376db9f04b0a8776cda3
author Geoff Lang <geofflang@chromium.org> Wed Nov 19 14:20:15 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Fri Nov 21 19:46:02 2014 +0000
tree 209b79bbe561ca03d8d86c745c39175f4a35545d
parent 746d0ea79208b514e95e626310bec513fa666ca4

Merge libGLESv2 and libEGL classes into libANGLE.

BUG=angle:733

Change-Id: Ic491c971411fe82c56cd97c5c8325ac14ec218df
Reviewed-on: https://chromium-review.googlesource.com/230830
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 09ec19a..e94a4ab 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -9,12 +9,6 @@
       [ 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(
@@ -153,25 +147,29 @@
     outputs = [ "$root_build_dir/d3dcompiler_47.dll" ]
   }
 
-  shared_library("libGLESv2") {
-    sources = rebase_path(gles_gypi.angle_libangle_sources, ".", "src")
-    sources += [
-      "src/libGLESv2/libGLESv2.cpp",
-      "src/libGLESv2/libGLESv2.def",
-      "src/libGLESv2/libGLESv2.rc",
-    ]
-
-    ldflags = [ "/DEF:" +
-               rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ]
-
-    defines = [
-      "ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " +
-        "\"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }",
+  config("libANGLE_config") {
+    defines = []
+    if (angle_enable_d3d9) {
+      defines += [ "ANGLE_ENABLE_D3D9" ]
+    }
+    if (angle_enable_d3d11) {
+      defines += [ "ANGLE_ENABLE_D3D11" ]
+    }
+    if (is_debug) {
+      defines += [ "ANGLE_ENABLE_DEBUG_ANNOTATIONS" ]
+    }
+    defines += [
       "GL_APICALL=",
       "GL_GLEXT_PROTOTYPES=",
       "EGLAPI=",
     ]
+  }
+
+  static_library("libANGLE") {
+    sources = rebase_path(gles_gypi.angle_libangle_sources, ".", "src")
+
     libs = []
+    defines = []
 
     # Windows-specific sources.
     sources += rebase_path(gles_gypi.angle_libangle_win_sources, ".", "src")
@@ -183,28 +181,38 @@
 
     if (angle_enable_d3d9) {
       sources += rebase_path(gles_gypi.angle_d3d9_sources, ".", "src")
-      defines += [ "ANGLE_ENABLE_D3D9" ]
       libs += [ "d3d9.lib" ]
     }
 
     if (angle_enable_d3d11) {
       sources += rebase_path(gles_gypi.angle_d3d11_sources, ".", "src")
-      defines += [ "ANGLE_ENABLE_D3D11" ]
       libs += [ "dxguid.lib" ]
     }
 
     if (is_debug) {
-      defines += [ "ANGLE_ENABLE_PERF" ]
+      defines += [
+        "ANGLE_GENERATE_SHADER_DEBUG_INFO",
+      ]
       libs += [ "d3d9.lib" ]
     }
 
+    defines += [
+      "ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ " +
+        "\"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }",
+    ]
+
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
+      ":commit_id_config",
+      ":libANGLE_config",
       ":internal_config",
       "//build/config/compiler:no_chromium_code",
     ]
 
-    include_dirs = [ "src/libGLESv2" ]
+    direct_dependent_configs = [
+      ":commit_id_config",
+      ":libANGLE_config",
+    ]
 
     deps = [
       ":commit_id",
@@ -214,17 +222,18 @@
     ]
   }
 
-  shared_library("libEGL") {
-    sources = rebase_path(egl_gypi.angle_libegl_sources, ".", "src")
+  shared_library("libGLESv2") {
+    sources = [
+      "src/libGLESv2/libGLESv2.cpp",
+      "src/libGLESv2/libGLESv2.def",
+      "src/libGLESv2/libGLESv2.rc",
+      "src/libGLESv2/main.cpp",
+      "src/libGLESv2/main.h",
+      "src/libGLESv2/resource.h",
+    ]
 
     ldflags = [ "/DEF:" +
-               rebase_path("src/libEGL/libEGL.def", root_build_dir) ]
-
-    defines = [
-      "GL_APICALL=",
-      "GL_GLEXT_PROTOTYPES=",
-      "EGLAPI=",
-    ]
+               rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
@@ -232,26 +241,34 @@
       "//build/config/compiler:no_chromium_code",
     ]
 
-    if (angle_enable_d3d11) {
-      defines += [ "ANGLE_ENABLE_D3D11" ]
-    }
+    deps = [
+      ":includes",
+      ":libANGLE",
+    ]
+  }
 
-    if (is_debug) {
-      defines += [
-        "ANGLE_ENABLE_PERF",
-        "ANGLE_GENERATE_SHADER_DEBUG_INFO"
-      ]
-    }
+  shared_library("libEGL") {
+    sources = [
+      "src/libEGL/libEGL.cpp",
+      "src/libEGL/libEGL.def",
+      "src/libEGL/libEGL.rc",
+      "src/libEGL/main.cpp",
+      "src/libEGL/main.h",
+      "src/libEGL/resource.h",
+    ]
 
-    include_dirs = [ "src/libGLESv2" ]
-    libs = [ "d3d9.lib" ]
+    ldflags = [ "/DEF:" +
+               rebase_path("src/libEGL/libEGL.def", root_build_dir) ]
 
-    # Windows-specific sources.
-    sources += rebase_path(gles_gypi.angle_libangle_win_sources, ".", "src")
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [
+      ":internal_config",
+      "//build/config/compiler:no_chromium_code",
+    ]
 
     deps = [
-      ":commit_id",
       ":includes",
+      ":libANGLE",
       ":libGLESv2",
     ]
   }