Backed out changeset 64a77898c426 (bug 1297924)

gfx/angle/AUTHORS

@@ -1,4 +1,4 @@
-# This is the official list of The ANGLE Project Authors
+# This is the official list of The ANGLE Project Authors
 # for copyright purposes.
 # This file is distinct from the CONTRIBUTORS files.
 # See the latter for an explanation.
@@ -45,4 +45,3 @@ Maks Naumov
 Jinyoung Hur
 Sebastian Bergstein
 James Ross-Gowan
-Nickolay Artamonov

gfx/angle/BUILD.gn

@@ -4,16 +4,8 @@
 
 # import the use_x11 variable
 import("//build/config/dcheck_always_on.gni")
-import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//third_party/angle/build/angle_common.gni")
-import("//ui/ozone/ozone.gni")
-
-if (ozone_platform_gbm) {
-  pkg_config("libdrm") {
-    packages = [ "libdrm" ]
-  }
-}
 
 angle_git_is_present = exec_script("src/commit_id.py",
                                    [
@@ -48,16 +40,6 @@ config("internal_config") {
   ]
 }
 
-config("extra_warnings") {
-  # Enable more default warnings on Windows.
-  if (is_win) {
-    cflags = [
-      "/we4244",  # Conversion: possible loss of data.
-      "/we4456",  # Variable shadowing.
-    ]
-  }
-}
-
 if (is_win) {
   copy("copy_compiler_dll") {
     sources = [
@@ -69,7 +51,10 @@ if (is_win) {
   }
 }
 
-angle_undefine_configs = [ "//build/config/compiler:default_include_dirs" ]
+angle_undefine_configs = [
+  "//build/config/compiler:chromium_code",
+  "//build/config/compiler:default_include_dirs",
+]
 
 component("translator") {
   sources = [
@@ -80,7 +65,10 @@ component("translator") {
   defines = [ "ANGLE_TRANSLATOR_IMPLEMENTATION" ]
 
   configs -= angle_undefine_configs
-  configs += [ ":internal_config" ]
+  configs += [
+    ":internal_config",
+    "//build/config/compiler:no_chromium_code",
+  ]
 
   public_deps = [
     ":translator_lib",
@@ -109,7 +97,10 @@ static_library("preprocessor") {
   sources = rebase_path(compiler_gypi.angle_preprocessor_sources, ".", "src")
 
   configs -= angle_undefine_configs
-  configs += [ ":internal_config" ]
+  configs += [
+    ":internal_config",
+    "//build/config/compiler:no_chromium_code",
+  ]
 }
 
 config("translator_static_config") {
@@ -139,8 +130,8 @@ static_library("angle_common") {
   configs += [
     ":angle_common_config",
     ":debug_annotations_config",
-    ":extra_warnings",
     ":internal_config",
+    "//build/config/compiler:no_chromium_code",
   ]
 
   public_deps = [
@@ -152,26 +143,6 @@ static_library("angle_common") {
   ]
 }
 
-config("angle_image_util_config") {
-  include_dirs = [
-    "include",
-    "src",
-  ]
-}
-
-static_library("angle_image_util") {
-  sources = rebase_path(gles_gypi.libangle_image_util_sources, ".", "src")
-
-  configs -= angle_undefine_configs
-  configs += [ ":internal_config" ]
-
-  public_configs = [ ":angle_image_util_config" ]
-
-  public_deps = [
-    ":angle_common",
-  ]
-}
-
 static_library("translator_lib") {
   sources = rebase_path(compiler_gypi.angle_translator_lib_sources, ".", "src")
   defines = []
@@ -197,6 +168,7 @@ static_library("translator_lib") {
   configs += [
     ":internal_config",
     ":translator_static_config",
+    "//build/config/compiler:no_chromium_code",
   ]
   public_configs = [ ":external_config" ]
 
@@ -208,12 +180,6 @@ static_library("translator_lib") {
   public_deps = [
     ":angle_common",
   ]
-
-  if (is_win) {
-    # Necessary to suppress some system header xtree warnigns in Release.
-    # For some reason this warning doesn't get triggered in Chromium
-    cflags = [ "/wd4718" ]
-  }
 }
 
 static_library("translator_static") {
@@ -227,7 +193,10 @@ static_library("translator_static") {
   }
 
   configs -= angle_undefine_configs
-  configs += [ ":internal_config" ]
+  configs += [
+    ":internal_config",
+    "//build/config/compiler:no_chromium_code",
+  ]
   public_configs = [ ":translator_static_config" ]
 
   public_deps = [
@@ -316,7 +285,6 @@ static_library("libANGLE") {
     ":angle_common",
   ]
   deps = [
-    ":angle_image_util",
     ":commit_id",
     ":includes",
     ":translator_static",
@@ -375,14 +343,6 @@ static_library("libANGLE") {
         "log",
       ]
     }
-    if (ozone_platform_gbm) {
-      configs += [ ":libdrm" ]
-      defines += [ "ANGLE_USE_OZONE" ]
-      deps += [ "//third_party/minigbm" ]
-      sources += rebase_path(gles_gypi.libangle_gl_egl_sources, ".", "src")
-      sources += rebase_path(gles_gypi.libangle_gl_egl_dl_sources, ".", "src")
-      sources += rebase_path(gles_gypi.libangle_gl_ozone_sources, ".", "src")
-    }
   }
 
   if (angle_enable_vulkan) {
@@ -394,13 +354,12 @@ static_library("libANGLE") {
   }
 
   configs -= angle_undefine_configs
-
   configs += [
     ":commit_id_config",
     ":debug_annotations_config",
-    ":extra_warnings",
     ":libANGLE_config",
     ":internal_config",
+    "//build/config/compiler:no_chromium_code",
   ]
 
   if (is_win) {
@@ -410,17 +369,6 @@ static_library("libANGLE") {
   }
 }
 
-config("shared_library_public_config") {
-  if (is_mac && !is_component_build) {
-    # Executable targets that depend on the shared libraries below need to have
-    # the rpath setup in non-component build configurations.
-    ldflags = [
-      "-rpath",
-      "@executable_path/",
-    ]
-  }
-}
-
 shared_library("libGLESv2") {
   sources = rebase_path(gles_gypi.libglesv2_sources, ".", "src")
 
@@ -429,20 +377,13 @@ shared_library("libGLESv2") {
         [ "/DEF:" + rebase_path("src/libGLESv2/libGLESv2.def", root_build_dir) ]
   }
 
-  if (is_mac && !is_component_build) {
-    ldflags = [
-      "-install_name",
-      "@rpath/${target_name}.dylib",
-    ]
-    public_configs = [ ":shared_library_public_config" ]
-  }
-
   configs -= angle_undefine_configs
   configs += [
     ":internal_config",
     ":commit_id_config",
     ":debug_annotations_config",
     ":libANGLE_config",
+    "//build/config/compiler:no_chromium_code",
   ]
 
   defines = [ "LIBGLESV2_IMPLEMENTATION" ]
@@ -460,21 +401,13 @@ shared_library("libEGL") {
     ldflags = [ "/DEF:" + rebase_path("src/libEGL/libEGL.def", root_build_dir) ]
   }
 
-  if (is_mac && !is_component_build) {
-    ldflags = [
-      "-install_name",
-      "@rpath/${target_name}.dylib",
-    ]
-    public_configs = [ ":shared_library_public_config" ]
-  }
-
   configs -= angle_undefine_configs
   configs += [
+    ":internal_config",
     ":commit_id_config",
     ":debug_annotations_config",
-    ":extra_warnings",
-    ":internal_config",
     ":libANGLE_config",
+    "//build/config/compiler:no_chromium_code",
   ]
 
   defines = [ "LIBEGL_IMPLEMENTATION" ]
@@ -492,7 +425,7 @@ util_gypi = exec_script("//build/gypi_to_gn.py",
 
 config("angle_util_config") {
   include_dirs = [ "util" ]
-  if (is_linux && use_x11) {
+  if (is_linux) {
     libs = [ "X11" ]
   }
 }
@@ -531,19 +464,12 @@ static_library("angle_util") {
     ]
   }
 
-  if (use_ozone) {
-    sources += rebase_path(util_gypi.util_ozone_sources, ".", "util")
-  }
-
   defines = [
     "GL_GLEXT_PROTOTYPES",
     "EGL_EGLEXT_PROTOTYPES",
   ]
 
-  configs += [
-    ":debug_annotations_config",
-    ":extra_warnings",
-  ]
+  configs += [ ":debug_annotations_config" ]
 
   public_configs = [
     ":angle_util_config",

gfx/angle/CONTRIBUTORS

@@ -104,12 +104,10 @@ NVIDIA Corporation
  Qingqing Deng
  Kimmo Kinnunen
  Sami Väisänen
- Martin Radev
 
 Opera Software ASA
  Daniel Bratell
  Tomasz Moniuszko
- David Landell
 
 Advanced Micro Devices, Inc.
  Russ Lind

gfx/angle/README.md

@@ -1,43 +1,26 @@
 # ANGLE - Almost Native Graphics Layer Engine
 
-The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other
-OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available
-for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop
-OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is
-underway, and future plans include compute shader support (ES 3.1) and MacOS support.
-
-### Level of OpenGL ES support via backing renderers
-
-|                |  Direct3D 9   |  Direct3D 11     |   Desktop GL   |    GL ES      |    Vulkan     |
-|----------------|:-------------:|:----------------:|:--------------:|:-------------:|:-------------:|
-| OpenGL ES 2.0  |    complete   |    complete      |    complete    |   complete    |  in progress  |
-| OpenGL ES 3.0  |               |    complete      |    complete    |  in progress  |  not started  |
-| OpenGL ES 3.1  |               |   not started    |   in progress  |  in progress  |  not started  |
-
-### Platform support via backing renderers
-
-|             |    Direct3D 9  |   Direct3D 11  |   Desktop GL  |    GL ES    |   Vulkan    |
-|------------:|:--------------:|:--------------:|:-------------:|:-----------:|:-----------:|
-| Windows     |    complete    |    complete    |   complete    |   complete  | in progress |
-| Linux       |                |                |   complete    |             |   planned   |
-| Mac OS X    |                |                |   in progress |             |             |
-| Chrome OS   |                |                |               |   complete  |   planned   |
-| Android     |                |                |               |   complete  |   planned   |
-
-ANGLE v1.0.772 was certified compliant by passing the ES 2.0.3 conformance tests in October 2011.
-ANGLE also provides an implementation of the EGL 1.4 specification.
-
-ANGLE is used as the default WebGL backend for both Google Chrome and Mozilla Firefox on Windows
-platforms. Chrome uses ANGLE for all graphics rendering on Windows, including the accelerated
-Canvas2D implementation and the Native Client sandbox environment.
-
-Portions of the ANGLE shader compiler are used as a shader validator and translator by WebGL
-implementations across multiple platforms. It is used on Mac OS X, Linux, and in mobile variants of
-the browsers. Having one shader validator helps to ensure that a consistent set of GLSL ES shaders
-are accepted across browsers and platforms. The shader translator can be used to translate shaders
-to other shading languages, and to optionally apply shader modifications to work around bugs or
-quirks in the native graphics drivers. The translator targets Desktop GLSL, Direct3D HLSL, and even
-ESSL for native GLES2 platforms.
+The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 to desktop OpenGL, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES 3.0 to all of these APIs is nearing completion, and future plans include enabling validated ES-to-ES support.
+
+|                |  Direct3D 9   |    Direct3D 11      |    Desktop GL      |    GL ES  |
+|----------------|:-------------:|:-------------------:|:------------------:|:---------:|
+| OpenGL ES 2.0  |    complete   |      complete       |     complete       |   planned |
+| OpenGL ES 3.0  |               |  nearing completion | nearing completion |   planned |
+[Level of OpenGL ES support via backing renderers]
+
+
+|             |    Direct3D 9  |   Direct3D 11  |   Desktop GL  |
+|------------:|:--------------:|:--------------:|:-------------:|
+| Windows     |        *       |        *       |       *       |
+| Linux       |                |                |       *       |
+| Mac OS X    |                |                |   in progress |
+[Platform support via backing renderers]
+
+ANGLE v1.0.772 was certified compliant by passing the ES 2.0.3 conformance tests in October 2011. ANGLE also provides an implementation of the EGL 1.4 specification.
+
+ANGLE is used as the default WebGL backend for both Google Chrome and Mozilla Firefox on Windows platforms. Chrome uses ANGLE for all graphics rendering on Windows, including the accelerated Canvas2D implementation and the Native Client sandbox environment.
+
+Portions of the ANGLE shader compiler are used as a shader validator and translator by WebGL implementations across multiple platforms. It is used on Mac OS X, Linux, and in mobile variants of the browsers. Having one shader validator helps to ensure that a consistent set of GLSL ES shaders are accepted across browsers and platforms. The shader translator can be used to translate shaders to other shading languages, and to optionally apply shader modifications to work around bugs or quirks in the native graphics drivers. The translator targets Desktop GLSL, Direct3D HLSL, and even ESSL for native GLES2 platforms.
 
 ## Sources