From d4aa0d2bfeb8c136570306968699174203896815 Mon Sep 17 00:00:00 2001
From: Chris Djali <57094650+chrisdjali-wrld3d@users.noreply.github.com>
Date: Thu, 9 Sep 2021 22:11:10 +0100
Subject: [angle] Enable ANGLE's desktop GL backend (#19891)

* Enable ANGLE's desktop GL backend

Only the D3D and GLES backends were available, but getting desktop GL to
work is trivial.

The Vulkan backend would be a much bigger task, unfortunately.

* x-add-version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/angle/CMakeLists.txt | 2 +-
 ports/angle/vcpkg.json     | 2 +-
 versions/a-/angle.json     | 5 +++++
 versions/baseline.json     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt
index 24ab01d86..70a2e2143 100644
--- a/ports/angle/CMakeLists.txt
+++ b/ports/angle/CMakeLists.txt
@@ -362,7 +362,7 @@ if(WINDOWS_DESKTOP OR LINUX OR APPLE)
     list(FILTER LIBANGLE_GL_SOURCES EXCLUDE REGEX "_unittest")
     add_library(angle_renderer_opengl INTERFACE)
     target_sources(angle_renderer_opengl INTERFACE "$<BUILD_INTERFACE:${LIBANGLE_GL_SOURCES}>")
-    target_compile_definitions(angle_renderer_opengl INTERFACE -DANGLE_ENABLE_OPENGL)
+    target_compile_definitions(angle_renderer_opengl INTERFACE -DANGLE_ENABLE_OPENGL -DANGLE_ENABLE_OPENGL_DESKTOP)
     add_library(angle::renderer::opengl ALIAS angle_renderer_opengl)
 endif()
 
diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json
index 3dc8b17df..e51cf0978 100644
--- a/ports/angle/vcpkg.json
+++ b/ports/angle/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "angle",
   "version-string": "chromium_4472",
-  "port-version": 1,
+  "port-version": 2,
   "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/versions/a-/angle.json b/versions/a-/angle.json
index 74633bb49..054aab9b9 100644
--- a/versions/a-/angle.json
+++ b/versions/a-/angle.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3c4f08e40691d643044cf9319cef04b4289d4b6f",
+      "version-string": "chromium_4472",
+      "port-version": 2
+    },
     {
       "git-tree": "d59efcadc61eb7a7be987e4dcc03540490af89b8",
       "version-string": "chromium_4472",
diff --git a/versions/baseline.json b/versions/baseline.json
index e2da5b296..66afb5eed 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -82,7 +82,7 @@
     },
     "angle": {
       "baseline": "chromium_4472",
-      "port-version": 1
+      "port-version": 2
     },
     "antlr4": {
       "baseline": "4.9.1",
-- 
cgit v1.2.3