[angle] Update to latest master (#6892)

* [angle] Update to latest master

* [angle] Add gpu_info_util

3 files changed, 45 insertions, 18 deletions

diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt
index f83f6294e..7d791db84 100644
--- a/ports/angle/CMakeLists.txt
+++ b/ports/angle/CMakeLists.txt
@@ -42,25 +42,25 @@ include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include)
 ##########

 # angle::common

 if(WIN32)

-    set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix")

+    set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix|android_")

 elseif(LINUX)

-    set(ANGLE_COMMON_PLATFORM_FILTER "_win|_mac")

+    set(ANGLE_COMMON_PLATFORM_FILTER "_win|_mac|android_")

 elseif(APPLE)

-    set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win")

+    set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|android_")

 endif()

 file(GLOB ANGLE_COMMON_SOURCES 

-	"src/common/*.h" 

-	"src/common/*.inl" 

-	"src/common/*.cpp" 

-	"src/common/third_party/base/anglebase/*.h" 

-	"src/common/third_party/base/anglebase/*.cc" 

-	"src/common/third_party/base/anglebase/containers/*.h" 

-	"src/common/third_party/base/anglebase/numerics/*.h" 

-	"src/common/third_party/base/anglebase/numerics/*.cc" 

-	"src/common/third_party/xxhash/*.h" 

-	"src/common/third_party/xxhash/*.c" 

-	"src/common/third_party/smhasher/src/*.h" 

-	"src/common/third_party/smhasher/src/*.cpp")

+    "src/common/*.h"

+    "src/common/*.inl"

+    "src/common/*.cpp"

+    "src/common/third_party/base/anglebase/*.h"

+    "src/common/third_party/base/anglebase/*.cc"

+    "src/common/third_party/base/anglebase/containers/*.h"

+    "src/common/third_party/base/anglebase/numerics/*.h"

+    "src/common/third_party/base/anglebase/numerics/*.cc"

+    "src/common/third_party/xxhash/*.h"

+    "src/common/third_party/xxhash/*.c"

+    "src/common/third_party/smhasher/src/*.h"

+    "src/common/third_party/smhasher/src/*.cpp")

 list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|${ANGLE_COMMON_PLATFORM_FILTER}")

 add_library(angle_common STATIC ${ANGLE_COMMON_SOURCES})

 target_include_directories(angle_common PUBLIC src/common/third_party/base)

@@ -191,6 +191,32 @@ if(WIN32)
     add_library(angle::renderer::d3d ALIAS angle_renderer_d3d)

 endif()

 

+## angle::gpu_info_util

+file(GLOB ANGLE_GPU_INFO_UTIL_SOURCES

+    "src/gpu_info_util/SystemInfo.h"

+    "src/gpu_info_util/SystemInfo_internal.h"

+    "src/gpu_info_util/SystemInfo.cpp"

+)

+add_library(angle_gpu_info_util STATIC ${ANGLE_GPU_INFO_UTIL_SOURCES})

+if(WIN32)

+    target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_win.cpp")

+    target_link_libraries(angle_gpu_info_util PRIVATE setupapi.lib dxgi.lib)

+elseif(APPLE)

+    target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_mac.mm")

+	find_library(IOKit IOKit)

+	find_library(CoreFoundation CoreFoundation)

+	find_library(CoreGraphics CoreGraphics)

+	target_link_libraries(angle_gpu_info_util PRIVATE ${IOKit} ${CoreFoundation} ${CoreGraphics})

+elseif(LINUX)

+    target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_linux.cpp" "src/gpu_info_util/SystemInfo_x11.cpp")

+    target_compile_definitions(angle_gpu_info_util PRIVATE GPU_INFO_USE_X11)

+    target_link_libraries(angle_gpu_info_util PRIVATE X11 Xi Xext)

+elseif(ANDROID)

+    target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_android.cpp")

+endif()

+target_link_libraries(angle_gpu_info_util PRIVATE angle::common)

+add_library(angle::gpu_info_util ALIAS angle_gpu_info_util)

+

 ## Core libANGLE library

 if(WIN32)

     set(LIBANGLE_SOURCES_PLATFORM

@@ -252,6 +278,7 @@ add_library(libANGLE STATIC ${LIBANGLE_SOURCES})
 target_link_libraries(libANGLE PRIVATE

     angle::common

     angle::image_util

+    angle::gpu_info_util

     angle::translator

     angle::preprocessor

     ${LIBANGLE_RENDERER_PLATFORM}

diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL
index cac71fae2..faa26f276 100644
--- a/ports/angle/CONTROL
+++ b/ports/angle/CONTROL
@@ -1,5 +1,5 @@
 Source: angle

-Version: 2019-03-13-c2ee2cc-3

+Version: 2019-06-13

 Homepage: https://github.com/google/angle

 Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.

   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.

diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake
index f0bda4a3d..48a6f7a3c 100644
--- a/ports/angle/portfile.cmake
+++ b/ports/angle/portfile.cmake
@@ -15,8 +15,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/angle
-    REF chromium/3672
-    SHA512 dd6a05f0f1f4544b8646c41ffcb4d5e3b41f5261771ada47889345a24d4e55e6370df55a26c354a7073efcde307644cec6c6064ea6fe498ed6b52c3017249f81
+    REF 0d3cf7085c8e953e78d4fa0656b26ee93d005452
+    SHA512 91550749933e278a72ae1094178ea28b36ee2b2fa553549477596ee772d1a39653386b3f3a9f168b0840a1511b7d31384b4e2d53cd5b5629028ca9c5a18a9288
     PATCHES 
         001-fix-uwp.patch
 )